正式环境的投诉评价

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java

@@ -251,7 +251,12 @@ public class AppEnforcementRegistrationController extends BaseController
 //            enforcementRegistration.setLawEnforcementItemText(null==ld1?"":ld1.getTitle());
 //            enforcementRegistration.setLawEnforcementBasisText(null==zq?"":zq.getLawName());
 
-            // 执法人员需要展示用户名+执法码
+            // 执法人员1需要展示用户名+执法码
+            UserBean userBean = userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
+            String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
+            enforcementRegistration.setLawEnforcer(userBean.getUserName() +" - "+ lawCN);
+
+            // 执法人员2需要展示用户名+执法码
             List<UserBean> userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
             String tmpUserShow = "";
             for (UserBean ub : userBeans) {

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java

@@ -17,9 +17,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -125,10 +129,15 @@ public class AppEnterpriseComplaintController extends BaseController {
                 JSONObject resObj = JSONObject.parseObject(resStr);
                 if ("0".equals(resObj.getString("resultCode"))) {
                     // 再判断是否超过5天 (超过5天也不让评价)
-                    LocalDate checkTime = LocalDate.parse(resObj.getString("endTime"), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-                    long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), checkTime);
+                    JSONObject endData = resObj.getJSONObject("endData");
+                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                    Date date = format.parse(endData.getString("endTime"));
+                    Instant instant = date.toInstant();
+                    ZoneId zoneId = ZoneId.systemDefault();
+                    LocalDate calDate = instant.atZone(zoneId).toLocalDate();
+                    long daysBetween = ChronoUnit.DAYS.between(calDate, LocalDate.now());
                     if (daysBetween <= 5) {
-                        resMap.put("res", resObj.getJSONObject("endData"));
+                        resMap.put("res", endData);
                     } else {
                         resMap.put("res", "0");
                     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-pro.yml

@@ -77,13 +77,13 @@ srnwg:
 
 
 mssq:
-  appId: ENC(iYSWCYHguGJTOxTcUjFcq4Tkp0HpU/7UqmxGtda3ORKF7a5UZiz612YlxZ9I4zL+)
-  appKey: ENC(m81tKAp6NtfW/97e3NNfnfq/1TN79M9JL9UY82dhKPxWJkedAuRJPNDBULZDv4ue5vFXcAHDGtWMsH6flq06B7MdjoYGrDc7)
-  apiUrl: ENC(2fR5TkUb/A0p4+Gp/As+LJsVCjq7pgNwJIG2OAk2yWLXY/q7DNaCDQ==)
+  appId: 30cd632d18c24bc2b476535494327987
+  appKey: MzBjZDYzMmQxOGMyNGJjMmI0NzY1MzU0OTQzMjc5ODc6U3pzejIwMjQ=
+  apiUrl: http://10.224.158.101:8182/proxy/
   hcpappid: zfjdm
-  hcpsign: ENC(SZL+KT860YpMBuK6GbNWTp0TYVeSu/DTYjKPRCm5xVJk9tI+O6/hqsE5zH9orApgjX6ggAS2hbGefmUsJwIkos0YtIgueK89ilDHtEy6/S0RWrnoi6F9aByxVG/mAwPxTPIXxwUECjvuET1rByTi7juNbufzWzJfYrH4dFXLmzbF5Cv5jJHM8R7Rq6DGL9X9UCqmROJygXv9KvrxN3OcnVoTHb0wQepEq6kplkd3SswLnPSDpb7q5vcs1XMxYcFRDLyqjmQYVRcx3HMsQZOGkTahOdzIfI/tL4D4upgYK1TFpaCiBL98vX/bh/s9RPmiHkyqMd8/R/NnoB8q5/5LldqxBhPCBi6RbPFGM/UfojdXeS5z2Uk/2w==)
-  hcptimestamp: 20240710172956
-  
+  hcpsign: 0460493a4493a06d4e4bf20df7495b36b019b311312b4fe305450a4bfd9cb8e5cba00ef71698f67cfc68247c4f43c7b71d0ec9d18b9d8f0b68ac048d8af563c8f8eff55a02f28cf524af9ff82b0e9d3e59bf750b3a1bb38b6dbb3f2075600b941aaa68317d882622734ed068bcb1b2e496b05991dcfc31169934a0805ef7abcf7371daff66ea
+  hcptimestamp: 20240801142433
+
 #短信平台
 sms:
   account: 122

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

@@ -57,17 +57,29 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     {
         EnterpriseLawEnforcement enterpriseLawEnforcement =
                 enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id);
+        // 执法人员1需要展示执法码
         if(enterpriseLawEnforcement.getLawEnforcerId() != null){
-            UserBean user =
-                    userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId()));
-//            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer() + " " + user.getLawCertificateNum() );
-            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer());
+            UserBean user = userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId()));
+            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer() + " " + user.getLawCertificateNum() );
+//            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer());
         }
+        // 执法人员2需要展示用户名+执法码
         if(StrUtil.isNotEmpty(enterpriseLawEnforcement.getLawEnforcerTwoId())){
-            UserBean user =
-                    userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerTwoId()));
+//            UserBean user = userApi.getUserByUserIds(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerTwoId()));
 //            enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
-            enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo());
+//            enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo());
+
+
+            List<UserBean> userBeans = userApi.getUserByUserIds(enterpriseLawEnforcement.getLawEnforcerTwoId());
+            String tmpUserShow = "";
+            for (UserBean ub : userBeans) {
+                String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
+                tmpUserShow += ub.getUserName() +" - "+ lawCertificateNum + ",";
+            }
+            if (tmpUserShow.length() > 0) {
+                tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
+            }
+            enterpriseLawEnforcement.setLawEnforcer2Show(tmpUserShow);
         }
         if(StrUtil.isNotEmpty(enterpriseLawEnforcement.getCheckItem())){
             LinkageDict linkageDict = linkageDictService.selectLinkageDictById(enterpriseLawEnforcement.getCheckItem());