八项作业与部分bug

src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java

@@ -726,7 +726,6 @@ public class CustomHiddenController extends BaseController {
             if (IS_SELF != null && IS_SELF.equals("1"))
                 pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID());
         }
-        ;
         // 旬
         if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) {
             // 1-10

src/main/java/com/zcloud/controller/mapApi/MapController.java

@@ -73,6 +73,7 @@ public class MapController extends BaseController {
     public ReturnMap getAlarmTypeCount() throws Exception {
         return ReturnMap.ok().put("data", PLSUtil.getAlarmTypeCount(Jurisdiction.getCORPINFO_ID()));
     }
+
     /**
      * @Description: 告警数据 来自人员定位系统
      * @Author: dearLin
@@ -96,6 +97,7 @@ public class MapController extends BaseController {
         }
         return returnMap;
     }
+
     /**
      * @Description: 人员定位情况 来自人员定位系统
      * @Author: dearLin
@@ -118,7 +120,7 @@ public class MapController extends BaseController {
     @RequestMapping(value = "/getRealTimeList")
     @ResponseBody
     public ReturnMap getRealTimeList() throws Exception {
-       return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID()));
+        return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID()));
     }
 
     /**
@@ -129,7 +131,7 @@ public class MapController extends BaseController {
     @RequestMapping(value = "/getFenceList")
     @ResponseBody
     public ReturnMap getFenceList() throws Exception {
-        return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(),1,999999));
+        return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(), 1, 999999));
     }
 
     /**
@@ -143,6 +145,19 @@ public class MapController extends BaseController {
         return eightWorkService.getEightWorks();
     }
 
+    /**
+     * @Description: 获取八项作业数
+     * @Param: [] []
+     * @Return: com.zcloud.util.ReturnMap
+     */
+    @RequestMapping(value = "/getEightWorksByType")
+    @ResponseBody
+    public ReturnMap getEightWorksByType() throws Exception {
+        PageData pageData = this.getPageData();
+        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        return ReturnMap.ok().put("varList", eightWorkService.getEightWorksByType(pageData));
+    }
+
     /**
      * @Description: 获取动火作业
      * @Param: [] []
@@ -187,6 +202,7 @@ public class MapController extends BaseController {
         PageData cameraCount = videomanagerService.getCameraTopToShow(pageData);
         return ReturnMap.ok().put("pd", cameraCount);
     }
+
     /**
      * @Description: 摄像头告警数
      * @Author: dearLin
@@ -202,6 +218,7 @@ public class MapController extends BaseController {
         List<PageData> cameraCount = videomanagerService.getCameraAlarmCount(pageData);
         return ReturnMap.ok().put("CameraAlarmCount", cameraCount);
     }
+
     /**
      * @Description: 摄像头报警类型
      * @Author: dearLin
@@ -260,8 +277,8 @@ public class MapController extends BaseController {
     @ResponseBody
     public ReturnMap getCharacterTrajectories() throws Exception {
         PageData pageData = getPageData();
-        return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(),Integer.parseInt(pageData.getString("id")),
+        return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("id")),
-                pageData.getString("startTime"),pageData.getString("endTime"),Integer.parseInt(pageData.getString("type"))));
+                pageData.getString("startTime"), pageData.getString("endTime"), Integer.parseInt(pageData.getString("type"))));
     }
 
     /**
@@ -288,7 +305,7 @@ public class MapController extends BaseController {
             int year = calendar.get(Calendar.YEAR);
             int month = calendar.get(Calendar.MONTH) + 1;
 
-            String monthString = String.format(year+"-%02d", month);
+            String monthString = String.format(year + "-%02d", month);
             String firstDayOfMonth = String.format("%04d-%02d-01 00:00:00", year, month);
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
             calendar.set(Calendar.HOUR_OF_DAY, 23);
@@ -323,6 +340,7 @@ public class MapController extends BaseController {
     public Object getCameraList() throws Exception {
         return ReturnMap.ok().put("varList", videomanagerService.getCameraList(getPageData()));
     }
+
     public static void main(String[] args) {
         List<Map<String, String>> timeArray = generateTimeArray();
         for (Map<String, String> monthInfo : timeArray) {

src/main/java/com/zcloud/controller/positioning/UserCardController.java

@@ -42,7 +42,7 @@ public class UserCardController extends BaseController {
         ReturnMap returnMap = new ReturnMap();
         page.setPd(pageData);
         JSONObject body = PLSUtil.getUserCardDataList(
-                Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("str"));
+                Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS"));
         if (body != null) {
             List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
             returnMap.put("varList", list);

src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java

@@ -100,6 +100,10 @@ public class IdentificationPartsController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         pd.put("ISDELETE", "0");    //是否删除 1-是  0-否
         pd.put("ISMATCHING", "0");
+        if (Tools.isEmpty(pd.getString("ELECTRONIC_FENCE_ID"))) {
+            pd.put("ELECTRONIC_FENCE_NAME", null);
+            pd.put("ELECTRONIC_FENCE_ID", null);
+        }
         identificationpartsService.save(pd);
 
         if (files != null && files.length > 0) {
@@ -237,7 +241,7 @@ public class IdentificationPartsController extends BaseController {
         PageData pageData = this.getPageData();
         String KEYWORDS = (String) pageData.getOrDefault("KEYWORDS", "");
 
-        JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(),KEYWORDS,Integer.parseInt(pageData.getString("currentPage")),Integer.parseInt(pageData.getString("showCount")),0);
+        JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(), KEYWORDS, Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), 0);
 
         if (body != null) {
             List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -445,6 +445,7 @@ public class UsersController extends BaseController {
         String msg = usersService.changeOrUpdUserCardNo(pd);
         if (msg.equals(Const.CAN_CHENG_USER)) {
             if (PLSUtil.editUser(pd)) {
+                if (Tools.isEmpty(pd.getString("CARDNO"))) {pd.put("CARDNO", null);}
                 usersService.editUser(pd);    //执行修改
                 if ("true".equals(pd.getString("ISSTUDENT"))) {
                     if ("select".equals(pd.getString("letDutiesType"))) {

src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java

@@ -16,5 +16,7 @@ public interface EightWorkMapper {
 	List<PageData> getEightWorks(PageData corp);
 
     List<PageData> listAllForDiagnosis(PageData pd);
+
+    List<PageData> getEightWorksByType(PageData pageData);
 }
 

src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java

@@ -112,7 +112,6 @@ public class CorpInfoServiceImpl implements CorpInfoService {
 	public PageData eightWorkBI(PageData pd) throws Exception{
 		return corpinfoMapper.eightWorkBI(pd);
 	}
-
 	@Override
 	public void updateEnterpriseId(PageData corpPage) {
 		corpinfoMapper.updateEnterpriseId(corpPage);

src/main/java/com/zcloud/service/eightwork/EightWorkService.java

@@ -19,4 +19,6 @@ public interface EightWorkService {
     List<PageData> list(PageData pd)throws Exception;
 
     List<PageData> listAllForDiagnosis(PageData pd)throws Exception;
+
+    List<PageData> getEightWorksByType(PageData pageData);
 }

src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java

@@ -111,4 +111,10 @@ public class EightWorkServiceImpl implements EightWorkService {
         return eightworkMapper.listAllForDiagnosis(pd);
     }
 
+    @Override
+    public List<PageData> getEightWorksByType(PageData pageData) {
+        return eightworkMapper.getEightWorksByType(pageData);
+
+    }
+
 }

src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml

@@ -87,4 +87,17 @@
 		union all
 		select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOTWORK f  where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
 	</select>
+	<select id="getEightWorksByType" resultType="com.zcloud.entity.PageData">
+		select
+		f.${TYPE}_ID ID,
+		f.CHECK_NO,
+		f.WORK_POSITION
+		from
+			BUS_${TYPE} f
+		left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
+		) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.${TYPE}_ID
+		where f.ISDELETE = '0' and f.WORK_POSITION is not null
+		and f.CORPINFO_ID = #{CORPINFO_ID}
+		and f.STEP_ID &gt; 0 and log.NEXT_STEP_ID != 99
+	</select>
 </mapper>