生物防控人员

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -116,7 +116,10 @@ public class SysUserController {
         sysUser.setPublicPhone(publicPhone);
         sysUser.setUserMali(userMali);
         sysUser.setPublicMali(publicMali);
-        sysUser.setEntryTime(DateUtil.parse(entryTime,"yyyy-MM-dd"));
+        if (StringUtils.isNotBlank(entryTime)){
+            sysUser.setEntryTime(DateUtil.parse(entryTime,"yyyy-MM-dd"));
+        }
+
         sysUser.setProbation(probation);
         sysUser.setDepartment(department);
         sysUser.setJob(job);

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -183,7 +183,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String farmId = (String)map.get("farmId");
         if (checkFarm(farmId))
             return new Result(10001,"牧场信息为空",false);
-        return new Result(ResultCode.SUCCESS,this.list());
+        return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<SysUser>().eq("farm_id",farmId)));
     }
 
     @Override

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillPersonnelAdmissionMapper.xml

@@ -27,7 +27,7 @@
         <result column="process_id" property="processId"/>
     </resultMap>
     <select id="listAll" resultType="com.huimv.receive.entity.vo.FactoryDirectorVo">
-        SELECT count(*) count,id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
+        select * from (SELECT count(*) count,id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
 FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
@@ -43,7 +43,7 @@ FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = #{type}
 UNION ALL
 
 SELECT count(*) count, id,admission_user_name AS 'userName', bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
-FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
+FROM bill_personnel_admission )  WHERE farm_id = #{farmId} AND vistit_type = #{type}
 ORDER BY sub_date DESC
     </select>