执法人员证件号更新按钮

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/UserController.java

@@ -345,4 +345,15 @@ public class UserController extends BaseController
         }
         return ZDResponse.success("查询成功",list);
     }
+
+    @RequiresPermissions("system:user:updateZfcode")
+    @PostMapping("/updateZfcode")
+    @ResponseBody
+    public AjaxResult updateZfcode(User user){
+        User user1=userService.selectUserById(user.getUserId());
+        System.out.println(user1);
+        //userService.updateLawCertificateNumByCertificateNumber2(user1.getCertificateNumber());
+        //userService.updateLawCertificateNumByCertificateNumber2("1548979999","444555666777888");
+        return toAjax(userService.updateLawCertificateNumByCertificateNumber2(user1.getCertificateNumber()));
+    }
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java

@@ -233,4 +233,6 @@ public interface UserMapper
      */
     int updateLawCertificateNum(String sfzcodeEncrypt);
     int updateLawCertificateNumByCertificateNumber(@Param("lawCertificateNum") String lawCertificateNum, @Param("sfzcodeEncrypt") String sfzcodeEncrypt);
+
+    int updateLawCertificateNumByCertificateNumber2(String sfzcodeEncrypt);
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java

@@ -262,4 +262,5 @@ public interface IUserService
      */
     int updateLawCertificateNum(String sfzcodeEncrypt);
     int updateLawCertificateNumByCertificateNumber(String lawCertificateNum, String sfzcodeEncrypt);
+    int updateLawCertificateNumByCertificateNumber2(String sfzcodeEncrypt);
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@@ -781,6 +781,11 @@ public class UserServiceImpl implements IUserService {
         return userMapper.updateLawCertificateNumByCertificateNumber(lawCertificateNum, sfzcodeEncrypt);
     }
 
+    @Override
+    public int updateLawCertificateNumByCertificateNumber2(String sfzcodeEncrypt) {
+        return userMapper.updateLawCertificateNumByCertificateNumber2(sfzcodeEncrypt);
+    }
+
     @Value("${srnwg.url}")
     private String znwgUrl;
     @Value("${srnwg.paasId}")

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -618,4 +618,10 @@
         set law_certificate_num = #{lawCertificateNum}
         where certificateNumber = #{sfzcodeEncrypt}
     </update>
+
+    <update id="updateLawCertificateNumByCertificateNumber2" parameterType="string">
+        update sys_user
+        set law_certificate_num = (select zfcode from zfryjdm2405301 where code_state = '01' and sfzcode_encrypt = #{sfzcodeEncrypt} limit 1)
+        where certificateNumber = #{sfzcodeEncrypt}
+    </update>
 </mapper> 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html

@@ -98,6 +98,7 @@
 		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
 		var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
+		var updateZfcodeFlag = [[${@permission.hasPermi('system:user:updateZfcode')}]];
 		var prefix = ctx + "system/user";
 
 		$(function() {
@@ -230,6 +231,7 @@
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.userId + '\',1071,617)"><i class="fa fa-edit"></i> 编辑</a> ');
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i> 删除</a> ');
 		                actions.push('<a class="btn btn-reset btn-xs ' + resetPwdFlag + '" href="javascript:void(0)" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-refresh"></i> 重置</a>');
+						actions.push('<a class="btn btn-reset btn-xs ' +updateZfcodeFlag+'"href="javascript:void(0)" onclick="updateLawCertificateNum(\'' + row.userId + '\')"><i class="fa fa-refresh"></i> 更新</a>');
 		                return actions.join('');
 		            }
 		        }]
@@ -308,6 +310,11 @@
 				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 1 });
 		    })
 		}
+		function updateLawCertificateNum(userId) {
+			$.modal.confirm("确认要更新用户吗？", function () {
+				$.operate.post(prefix + "/updateZfcode", { "userId": userId });
+			})
+		}
 
 		/* 用户管理启用 */
 		function enable(userId) {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java

@@ -48,7 +48,7 @@ public class EnforcementCheckStatisticsController extends BaseController {
     @GetMapping ("/queryList/{year}/{month}")
     @ResponseBody
     public void queryList(HttpServletResponse response, @PathVariable String year, @PathVariable List<Integer> month)
-    {
+    {//以执法主体维度统计
         EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics();
         String month1=StringUtils.join(month,",");
         enforcementCheckStatistics.setYear(year);
@@ -92,7 +92,7 @@ public class EnforcementCheckStatisticsController extends BaseController {
     @GetMapping ("/queryAllList/{year}/{month}")
     @ResponseBody
     public void queryAllList(HttpServletResponse response, @PathVariable String year, @PathVariable List<Integer> month)
-    {
+    {//以企业维度统计
         EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics();
         String month1=StringUtils.join(month,",");
         enforcementCheckStatistics.setYear(year);
@@ -106,7 +106,7 @@ public class EnforcementCheckStatisticsController extends BaseController {
             String area=inOrderList.get(i);
             //List<EnforcementCheckStatistics> e1=enforcementCheckStatisticsList.stream().filter(item->item.getEnterpriseAddress().contains(area)).collect(Collectors.toList());
             List<EnforcementCheckStatistics> e1=new ArrayList<>();
-            if(area.equals("光明区")){
+            if(area.equals("光明区")){//光明区特殊处理
                 //e1 = enforcementCheckStatisticsList.stream().collect(Collectors.groupingBy(item -> ((item.getEnterpriseAddress().contains(area)||(item.getEnterpriseAddress().contains("光明新区")))? area : "其他")));
                 e1=enforcementCheckStatisticsList.stream().filter(item->(item.getEnterpriseAddress().contains(area)||item.getEnterpriseAddress().contains("光明新区"))).collect(Collectors.toList());
             }else {
@@ -115,6 +115,7 @@ public class EnforcementCheckStatisticsController extends BaseController {
             }
             enforcementCheckStatisticsMap.put(area,e1);
         }
+        //将地址不属于各个区的筛出来放入执法记录map
         List<EnforcementCheckStatistics> qt=enforcementCheckStatisticsList.stream().filter(item->!(
                 item.getEnterpriseAddress().contains("福田区")||item.getEnterpriseAddress().contains("罗湖区")||
                 item.getEnterpriseAddress().contains("盐田区")||item.getEnterpriseAddress().contains("南山区")||

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java

@@ -326,7 +326,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         sheet2.setDefaultColumnWidth(20);//全局
         List<String> inOrderList2=new ArrayList<>();
         Collections.addAll(inOrderList2,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区",
-                "坪山区","光明区","大鹏新区","深汕特别合作区","其他");
+                "坪山区","光明区","大鹏新区","深汕特别合作区");
         Map<String, List<EnterpriseStreet>> map1=enterpriseStreet.stream().collect(Collectors.groupingBy(item->(inOrderList2.contains(item.getEnterpriseAddress().substring(3,6))?item.getEnterpriseAddress().substring(3,6):"其他")));
         //List<EnterpriseStreet> es1= (List<EnterpriseStreet>) map1.get("其他").stream().filter(item->item.getEnterpriseAddress().substring(3,10).equals("深汕特别合作区"));
         //System.out.println("第317行："+map1.get("其他"));
@@ -341,7 +341,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         System.out.println("第325行："+map1.get("光明区"));*/
         map1.get("光明区").addAll(es3);
         //删除在”其他“中多余的数据
-        for(int i = 0 ;i < map1.get("其他").size(); i++){
+/*        for(int i = 0 ;i < map1.get("其他").size(); i++){
             if(map1.get("其他").get(i).getEnterpriseAddress().contains("深汕特别合作区")){
                 map1.get("其他").remove(i);
             }else if(map1.get("其他").get(i).getEnterpriseAddress().contains("光明新区")){
@@ -349,7 +349,18 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
             }else if(map1.get("其他").get(i).getEnterpriseAddress().contains("大鹏新区")){
                 map1.get("其他").remove(i);
             }
-        }
+        }*/
+        map1.remove("其他");
+        List<EnterpriseStreet> e2=enterpriseStreet.stream().filter(item->!(
+                item.getEnterpriseAddress().contains("福田区")||item.getEnterpriseAddress().contains("罗湖区")||
+                        item.getEnterpriseAddress().contains("盐田区")||item.getEnterpriseAddress().contains("南山区")||
+                        item.getEnterpriseAddress().contains("宝安区")||item.getEnterpriseAddress().contains("龙岗区")||
+                        item.getEnterpriseAddress().contains("龙华区")||item.getEnterpriseAddress().contains("坪山区")||
+                        item.getEnterpriseAddress().contains("大鹏新区")||item.getEnterpriseAddress().contains("深汕特别合作区")||
+                        item.getEnterpriseAddress().contains("光明区")||item.getEnterpriseAddress().contains("光明新区")))
+                .collect(Collectors.toList());
+        map1.put("其他",e2);
+        inOrderList2.add("其他");
         /*System.out.println("第327行："+map1.get("光明区"));*/
         for(String area:inOrderList2){
             if(map1.get(area)!=null) {