Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

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

@@ -148,7 +148,7 @@ public class SystemUserController {
         return Result.success(systemUserService.getSystemUserBySn(map));
     }
 
-    @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表", httpMethod = "POST")
+    @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表1", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"),
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),

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

@@ -18,7 +18,7 @@
         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
-        left join xz_project_org po on po.id=a.xz_project_org_id
+        left join xz_project_org xpo on xpo.id=a.xz_project_org_id
         WHERE a.sn = #{projectSn}
         and a.account_type = 6
         <if test="workerName != null and workerName != ''">
@@ -37,7 +37,7 @@
             and pe.enterprise_type_id = #{enterpriseTypeId}
         </if>
         <if test="xzProjectOrgId != null and xzProjectOrgId != ''">
-            and po.id = #{xzProjectOrgId}
+            and xpo.id = #{xzProjectOrgId}
         </if>
         <if test="userId != null and userId != ''">
             and a.user_id = #{userId}

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java

@@ -169,7 +169,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
             DeptDo deptDo = new DeptDo();
             deptDo.setId(xzProjectOrg.getId().toString());
             deptDo.setDeptName(xzProjectOrg.getDeptName());
-            deptDo.setLeader("");
+            deptDo.setLeader(xzProjectOrg.getLeader() == null ? null : xzProjectOrg.getLeader().toString());
             deptDo.setParentId(xzProjectOrg.getParentId().toString());
             return deptDo;
         }

src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java

@@ -24,6 +24,9 @@ public interface WorkerInfoAuditRecordMapper extends BaseMapper<WorkerInfoAuditR
     @DataScope(includeTable = "worker_info_audit_record")
     List<EntityMap> selectWorkerInfoAuditList(Page<EntityMap> page, @Param("param")Map<String, Object> map);
 
+    @DataScope(includeTable = "worker_info_audit_record")
+    List<EntityMap> selectWorkerInfoAuditList1(Page<EntityMap> page, @Param("param")Map<String, Object> map);
+
 
     @DataScope(includeTable = "worker_info_audit_record")
     EntityMap viewWorkerInfoDetail(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml

@@ -45,6 +45,53 @@
         order by a.id desc
     </select>
 
+    <select id="selectWorkerInfoAuditList1" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+        SELECT a.*,b.team_name,c.department_name,p.enterprise_name,
+        (case when a.birthday!='' then year(from_days(datediff(NOW(),a.birthday)))
+        else '-' end ) age,d.dictionary_name job_type_name,e.dictionary_name job_name_value
+        from worker_info_audit_record a
+        LEFT JOIN team_info b ON a.team_id=b.id
+        LEFT JOIN department_info c ON a.department_id=c.id
+        LEFT JOIN dictionaries_record d ON a.job_type=d.id
+        LEFT JOIN dictionaries_record e ON a.job_name=e.id
+        LEFT JOIN enterprise_info p ON p.id=a.enterprise_id
+        WHERE a.project_sn=#{param.projectSn}
+        <if test="param.workerName!=null and param.workerName!=''">
+            and a.worker_name like CONCAT(CONCAT('%',#{param.workerName}),'%')
+        </if>
+        <if test="param.idCard!=null and param.idCard!=''">
+            and a.id_card like CONCAT(CONCAT('%',#{param.idCard}),'%')
+        </if>
+        <if test="param.enterpriseId!=null and param.enterpriseId!=''">
+            and a.enterprise_id=#{param.enterpriseId}
+        </if>
+        <if test="param.userEnterpriseId!=null and param.userEnterpriseId!=''">
+            and  FIND_IN_SET(a.enterprise_id,#{param.userEnterpriseId})
+        </if>
+        <if test="param.inserviceType!=null and param.inserviceType!=''">
+            and a.inService_type=#{param.inserviceType}
+        </if>
+        <if test="param.enterDate!=null and param.enterDate!=''">
+            and a.enter_date=#{param.enterDate}
+        </if>
+        <if test="param.teamId!=null and param.teamId!=''">
+            and a.team_id=#{param.teamId}
+        </if>
+        <if test="param.departmentId!=null and param.departmentId!=''">
+            and a.department_id=#{param.departmentId}
+        </if>
+        <if test="param.personType!=null and param.personType!=''">
+            and a.person_type=#{param.personType}
+        </if>
+        <if test="param.isExamPass!=null">
+            and a.is_exam_pass=#{param.isExamPass}
+        </if>
+        AND contract_info IS NOT NULL
+        AND special_certificate_info IS NOT NULL
+        AND insurance_info IS NOT NULL
+        order by a.id desc
+    </select>
+
     <select id="viewWorkerInfoDetail" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
         SELECT a.*,
                b.team_name,

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java

@@ -62,7 +62,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl<WorkerInfoAudi
     public List<EntityMap> getPassList(Map<String, Object> map) {
         Page<EntityMap> page = new Page<>(-1,  10);
         map.put("isExamPass", 1);
-        return workerInfoAuditRecordMapper.selectWorkerInfoAuditList(page, map);
+        return workerInfoAuditRecordMapper.selectWorkerInfoAuditList1(page, map);
     }
 
     @Override