bug修改

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java

@@ -165,6 +165,7 @@ public class SystemUserController {
             @ApiImplicitParam(name = "workerName", required = false, value = "姓名", paramType = "body"),
             @ApiImplicitParam(name = "workerId", required = false, value = "劳务人员id", paramType = "body"),
             @ApiImplicitParam(name = "enterpriseId", required = false, value = "企业id（多个，分割）", paramType = "body"),
+            @ApiImplicitParam(name = "enterpriseTypeId", required = false, value = "企业类型id", paramType = "body"),
     })
     @PostMapping(value = "/getProjectChilderSystemUserList")
     public Result<List<SystemUser>> getProjectChilderSystemUserList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml

@@ -16,6 +16,8 @@
         LEFT JOIN base_role c ON c.role_id = b.role_id
         LEFT JOIN worker_info d ON a.worker_id = d.id
         LEFT JOIN xz_project_org po on po.id=a.xz_project_org_id
+        LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id
+        LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=a.sn
         WHERE a.sn = #{projectSn}
         and a.account_type = 6
         <if test="workerName != null and workerName != ''">
@@ -30,6 +32,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="enterpriseTypeId != null and enterpriseTypeId != ''">
+            and pe.enterprise_type_id = #{enterpriseTypeId}
+        </if>
     </select>
     <select id="findByUsername" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" parameterType="string">
         select *

src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java

@@ -205,8 +205,8 @@ public class HiddenDangerInspectRecord implements Serializable {
 
     @ApiModelProperty(value = "扣分数")
     private Double deductScore;
-    @ApiModelProperty(value = "合作单位id")
+    @ApiModelProperty(value = "合作单位id(多个,分割)")
-    private Long enterpriseId;
+    private String enterpriseId;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "验收表验收任务-验收结果ID")

src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java

@@ -23,13 +23,12 @@ import java.util.Map;
  * @version： V1.0
  */
 @Mapper
-@DataScope
 public interface HiddenDangerInspectRecordMapper extends BaseMapper<HiddenDangerInspectRecord> {
 
-    @DataScope(includeTable = "hidden_danger_inspection_record")
+    @DataScope(includeTable = "enterprise_info")
     List<HiddenDangerInspectRecord> selectHiddenDangerInspectPage(Page<HiddenDangerInspectRecord> page, @Param("param") Map<String, Object> map);
 
-    @DataScope(includeTable = "hidden_danger_inspection_record")
+    @DataScope(includeTable = "enterprise_info")
     List<HiddenDangerInspectRecord> selectHiddenDangerInspectPage(@Param("param") Map<String, Object> map);
 
     EntityMap selectHiddenDangerInspectRecordById(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml

@@ -47,9 +47,9 @@
         a.review_fail_type,
         a.rectify_fail_type,
         a.overdue_close_type,
-        b.enterprise_name,
+        group_concat(b.enterprise_name) enterprise_name,
         d.real_name create_user_name,
-        e.real_name change_user_name,
+        group_concat(e.real_name) change_user_name,
         f.real_name review_user_name,
         t.inspect_type_name,
         en.enterprise_name create_enterprise_name,
@@ -60,9 +60,9 @@
         ir.id as hiddenDangerInspectRegionId,
         ir.region_name as hiddenDangerInspectRegionName
         from hidden_danger_inspection_record a
-        LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn
+        LEFT JOIN enterprise_info b ON find_in_set(b.id,a.enterprise_id)
         LEFT JOIN system_user d ON a.create_user = d.user_id
-        LEFT JOIN system_user e ON a.change_user = e.user_id
+        LEFT JOIN system_user e ON find_in_set(e.user_id,a.change_user)
         LEFT JOIN system_user f ON a.review_id = f.user_id
         LEFT JOIN inspect_type t ON a.inspect_type_id = t.id
         LEFT JOIN worker_info wk ON wk.id = d.worker_id
@@ -120,6 +120,7 @@
         <if test="param.inspectEndTime != null and param.inspectEndTime != ''">
             and a.inspect_time &lt;= CONCAT(DATE_FORMAT(#{param.inspectEndTime}, "%Y-%m-%d"), ' 23:59:59')
         </if>
+        group by a.id
         order by a.create_time desc
     </select>
     <select id="selectDangerInspectCountByTask" resultType="java.util.Map">

src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java

@@ -166,7 +166,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
         if (StrUtil.isNotBlank(enterpriseSn)) {
             EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>()
                     .eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
-            hiddenDangerInspectRecord.setEnterpriseId(enterpriseInfo.getId());
+            hiddenDangerInspectRecord.setEnterpriseId(String.valueOf(enterpriseInfo.getId()));
         }
         hiddenDangerInspectRecordMapper.insert(hiddenDangerInspectRecord);
         deductScoreIf(hiddenDangerInspectRecord);

src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
@@ -19,6 +20,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface QualityRegionMapper extends BaseMapper<QualityRegion> {
 
+    @DataScope(includeTable = "enterprise_info")
     List<QualityRegion> selectQualityRegionList(Map<String, Object> map);
 
     List<QualityRegion> selectChildQualityRegionList(Map<String, Object> map);