系统bug修改

bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppServiceImpl.java

@@ -834,7 +834,7 @@ public class AppServiceImpl implements AppService {
         AjaxResult ajaxResult = AjaxResult.success();
         //查询监理人员详细信息
         SupervisorPerson bean = appMapper.listSupervisorPersonById(supervisorPerson);
-        setOtherData2(bean);
+     //   setOtherData2(bean);
         //人脸照片
         SysFileInfo fileInfo = new SysFileInfo();
         fileInfo.setFileName("人脸照片.png");
@@ -844,7 +844,6 @@ public class AppServiceImpl implements AppService {
         fileInfo.setCreateTime(bean.getCreateTime());
         fileInfo.setFileSize("0");
         bean.setFacePhoto(Collections.singletonList(fileInfo));
-
         //查询体检文件
         fileInfo = getPersonFileInfo(StaticVariableUtils.FIVE,StaticVariableUtils.THREE,StaticVariableUtils.ONE,
                 supervisorPerson.getUuid());
@@ -870,10 +869,10 @@ public class AppServiceImpl implements AppService {
     @Override
     public List<SupervisorPerson> listSupervisorPerson(SupervisorPerson bean) {
         List<SupervisorPerson> list= appMapper.listSupervisorPerson(bean);
-        for (SupervisorPerson vo:list){
+//        for (SupervisorPerson vo:list){
-            setOtherData(vo);
+//            setOtherData(vo);
-
+//
-        }
+//        }
         return list;
     }
 

bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java

@@ -467,6 +467,14 @@ public class BusinessServiceImpl implements BusinessService {
                         userList.addAll(jlList);
                     }
                 }
+                if("03".equals(auditTask.getUserType())){
+                    if(StringUtils.isNotEmpty(contUserId)){
+                        userList.add(contUserId);
+                    }
+                    if(StringUtils.isNotEmpty(supUserId)){
+                        userList.add(supUserId);
+                    }
+                }
                 auditTask.setExamineId(newExamineId);
                 auditTask.setExamineType(examineType);
                 if("01".equals(auditTask.getUserType())){

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java

@@ -240,15 +240,14 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
             AdmissionRequest proUser = arMapper.getUserInToPro(bean);
             if(proUser!=null){
                 if(!"3".equals(proUser.getOutStatus())){
-                    return new AjaxResult(201,"该人员已在其他工程入场,清先出场后再入场");
+                    return new AjaxResult(201,"该人员已在其他工程入场,请先出场后再入场");
                 }
             }
             if ("".equals(bean.getConsUserId())) {
-
                 AdmissionRequest admissionRequest = arMapper.checkUserNameUnique(bean);
-                if (admissionRequest != null) {
+                if (admissionRequest != null && StringUtils.isNotEmpty(admissionRequest.getOutStatus()) ) {
                     //已出场的 人员再次入场
-                    if("3".equals(admissionRequest.getOutStatus())){
+                    if( "3".equals(admissionRequest.getOutStatus())){
                         arMapper.delFileById(admissionRequest);
                         id = String.valueOf(admissionRequest.getId());
                         uuid = admissionRequest.getUuid();
@@ -360,7 +359,7 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
         AjaxResult ajaxResult = AjaxResult.success();
         //查询监理人员详细信息
         AdmissionRequest admissionRequest = arMapper.getData(bean);
-        setOtherData3(admissionRequest);
+       // setOtherData3(admissionRequest);
         SysFileInfo fileInfo = new SysFileInfo();
         if (StringUtils.isNotEmpty(admissionRequest.getFacePath())) {
             fileInfo.setName("人脸照片.png");

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/OutsourcingProServiceImpl.java

@@ -65,9 +65,9 @@ public class OutsourcingProServiceImpl implements OutsourcingProService {
     @Override
     public List<SupervisorPerson> listSupervisorPerson(SupervisorPerson bean) {
         List<SupervisorPerson> list= mapper.listSupervisorPerson(bean);
-        for (SupervisorPerson vo:list){
+//        for (SupervisorPerson vo:list){
-            setOtherData(vo);
+//            setOtherData(vo);
-        }
+//        }
         return list;
     }
     public void setOtherData(SupervisorPerson vo){
@@ -75,8 +75,9 @@ public class OutsourcingProServiceImpl implements OutsourcingProService {
             String idCard=mapper.getIdCardByPhone(vo.getPhone());
             if(!StringHelper.isNullOrEmptyString(idCard)){
                 vo.setIdCard(idCard);
+
+                if(StringHelper.isNullOrEmptyString(vo.getSex())){
                     String sex=getSexByIdCar(idCard);
-                if(!StringHelper.isNullOrEmptyString(sex)){
                     vo.setSex(sex);
                 }
                 Integer age= IdcardUtil.getAgeByIdCard(idCard);
@@ -94,7 +95,7 @@ public class OutsourcingProServiceImpl implements OutsourcingProService {
                 vo.setIdCard(idCard);
                 String sex=getSexByIdCar1(idCard);
                 if(!StringHelper.isNullOrEmptyString(sex)){
-                    vo.setSex(sex);
+                  //  vo.setSex(sex);
                 }
                 Integer age= IdcardUtil.getAgeByIdCard(idCard);
                 vo.setAge(age);
@@ -141,7 +142,7 @@ public class OutsourcingProServiceImpl implements OutsourcingProService {
         AjaxResult ajaxResult = AjaxResult.success();
         //查询监理人员详细信息
         SupervisorPerson bean = mapper.listSupervisorPersonById(supervisorPerson);
-        setOtherData3(bean);
+      //  setOtherData3(bean);
         //人脸照片
         SysFileInfo fileInfo = new SysFileInfo();
         if(!StringUtils.isEmpty(bean.getFaceUrl())){
@@ -362,9 +363,9 @@ public class OutsourcingProServiceImpl implements OutsourcingProService {
         subPerson.setUserId(userId);
         subPerson.setType("1");
         List<SubPerson> getConsPersonList = mapper.getSubPersonList(subPerson);
-        for (SubPerson vo:getConsPersonList){
+//        for (SubPerson vo:getConsPersonList){
-            setOtherData2(vo);
+//            setOtherData2(vo);
-        }
+//        }
         List<String> list = mapper.getAnnotationsByTaskIdAndUserId(subPerson);
         // 使用哈希表存储注释列表，提高查找效率
         Set<String> annotationSet = new HashSet<>(list);

bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml

@@ -715,7 +715,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePersonStatus">
         update lk_cont_person
            set into_status = '0',
-               cons_name=#{consName},
                out_status = '0',
                admission_date = null,
                departure_date = null,

bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml

@@ -201,10 +201,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and   lps.status = #{status}
         </if>
         <if test="proName != null and proName != ''">
-            AND ppi.pro_name = #{proName}
+            AND ppi.pro_name like concat('%',#{proName},'%')
         </if>
         <if test="supName != null and supName != ''">
-            AND psi.sup_name = #{supName}
+            AND ppi.sup_name like concat('%',#{supName},'%')
         </if>
         <if test="proId != null and proId != ''">
             AND ppi.pro_id = #{proId}