联合登记, 和通知的fpd附件显示

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

@@ -147,7 +147,7 @@ public class AppThirdLoginController {
 
             // 获取 用户Id
             userJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+token+"&code="+code, null);
-
+            log.info(">>> 市认证用户信息: {}", userJson);
             JSONObject userOjb = JSONObject.parseObject(userJson);
             String userId = userOjb.getString("UserId");
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java

@@ -53,8 +53,9 @@ public class Notice extends BaseDomain
     private String endTime;
     private String createTimeStr;
 
-    private  FileObject fileObject;
+    private FileObject fileObject;
 
+    private  List<FileObject> fileObjects;
 
     /**
      * 文件对象
@@ -88,6 +89,14 @@ public class Notice extends BaseDomain
         this.fileObject = fileObject;
     }
 
+    public List<FileObject> getFileObjects() {
+        return fileObjects;
+    }
+
+    public void setFileObjects(List<FileObject> fileObjects) {
+        this.fileObjects = fileObjects;
+    }
+
 
 
     public String getNoticeId()

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/NoticeServiceImpl.java

@@ -47,7 +47,19 @@ public class NoticeServiceImpl implements INoticeService
     @Override
     public Notice selectNoticeById(String noticeId)
     {
-        return noticeMapper.selectNoticeById(noticeId);
+        Notice notice = noticeMapper.selectNoticeById(noticeId);
+        List<ZdxtFileCommon> zdxtFileCommons = zdxtFileCommonApi.selectZdxtFileById(notice.getNoticeId());
+        List<Notice.FileObject> fs = new ArrayList<>();
+        for (ZdxtFileCommon f : zdxtFileCommons) {
+            if(zdxtFileCommons != null && zdxtFileCommons.size() > 0){
+                Notice.FileObject fileObject = new Notice.FileObject();
+                fileObject.setFileName(zdxtFileCommons.get(0).getFileName());
+                fileObject.setFileUrl(zdxtFileCommons.get(0).getUploadPath());
+                fs.add(fileObject);
+            }
+        }
+        notice.setFileObjects(fs);
+        return notice;
     }
 
     /**

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html

@@ -432,7 +432,6 @@
 						html +=	'	</div>';
 						html += '</div>';
 					}
-					console.log(html.length);
 					$("#sixIndicators").html(html);
 				}
 			},
@@ -511,7 +510,7 @@
 						html += '	<span>'+datas[i].per+'</span>'
 						html += '</div>'
 					}
-					$("#complaint_category").html(html);
+					// $("#complaint_category").html(html);
 				}
 			},
 			error: function (error) {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java

@@ -149,6 +149,7 @@ public interface EnforcementRegistrationMapper
      * @return
      */
     List<EnforcementRegistration> selectEnforcementRegistrationByUnion(EnforcementRegistration enforcementRegistration);
+    int outTimeByUnion(EnforcementRegistration enforcementRegistration);
 
     /**
      * 根据联合检查

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

@@ -415,7 +415,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
             EnforcementRegistration raw_data = selectEnforcementRegistrationById(enforcementRegistration.getId());
             // 如果是联合执法
-            if (1 == raw_data.getHasUnion()) {
+            if (1 == raw_data.getHasUnion() && 1 == enforcementRegistration.getHasUnion()) {
                 // 如果联合的部门没改变, 则无需处理!
                 if (!raw_data.getUnionNo().equals(enforcementRegistration.getUnionNo())) {
                     // 如果改变, 这通过原联合code查出已联合数量, 数量>2则无需修改他人数据, 2<=则将他人的联合标签hasUnion设为0
@@ -436,6 +436,22 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                         enforcementRegistrationMapper.updateRegToUnionFlag(updateUnionParams2);
                     }
                 }
+            } else {
+                EnforcementRegistration er = new EnforcementRegistration();
+                er.setUnionNo(raw_data.getUnionNo());
+                List<EnforcementRegistration> raw_unions = enforcementRegistrationMapper.selectEnforcementRegistrationByUnion(er);
+                if (raw_unions.size() <= 2) {
+                    // 将原自身 union_no 清空 将所有关联的 has_union 置 0
+                    EnforcementRegistration updateUnionParams1 = new EnforcementRegistration();
+                    updateUnionParams1.setUnionNo("-1");
+                    updateUnionParams1.setId(raw_data.getId());
+                    enforcementRegistrationMapper.updateEnforcementRegistration(updateUnionParams1);
+
+                    EnforcementRegistration updateUnionParams2 = new EnforcementRegistration();
+                    updateUnionParams2.setUnionNo(raw_data.getUnionNo());
+                    updateUnionParams2.setHasUnion(0);
+                    enforcementRegistrationMapper.updateRegToUnionFlag(updateUnionParams2);
+                }
             }
         }
         // 然后开始走新增联合执法的流程
@@ -1130,7 +1146,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         // 定义时间格式
         DateTimeFormatter time_formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         // 定义时间格式
-        DateTimeFormatter date_formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//        DateTimeFormatter date_formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
         // 获取当前时间
         LocalDateTime now_tmp = LocalDateTime.now();
@@ -1145,24 +1161,47 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             LocalDateTime dateTime = LocalDateTime.parse(enforcementTime, time_formatter);
             // 获取登记前一个小时的时间
             LocalDateTime oneHourAgo_tmp = dateTime.minusHours(1);
+            LocalDateTime oneHourLater_tmp = dateTime.plusHours(1);
             // 格式化时间
-            String now = dateTime.format(time_formatter);
             String oneHourAgo = oneHourAgo_tmp.format(time_formatter);
+            String oneHourLater = oneHourLater_tmp.format(time_formatter);
             er.setBeginTime(oneHourAgo);
-            er.setEndTime(now);
-            er.setUnionNo(unionNo);
+            er.setEndTime(oneHourLater);
+//            er.setUnionNo(unionNo);
         } else {
             // 获取当前时间前一个小时的时间
             LocalDateTime oneHourAgo_tmp = now_tmp.minusHours(1);
+            LocalDateTime oneHourLater_tmp = now_tmp.plusHours(1);
             // 格式化时间
-            String now = now_tmp.format(time_formatter);
             String oneHourAgo = oneHourAgo_tmp.format(time_formatter);
+            String oneHourLater = oneHourLater_tmp.format(time_formatter);
             er.setBeginTime(oneHourAgo);
-            er.setEndTime(now);
+            er.setEndTime(oneHourLater);
         }
 
         // 可能会出现 同一时间 多组人, 多组联合执法 , 所以新增的时候还是需要生成联合执法id ,
         List<EnforcementRegistration> enforcementRegistrations = enforcementRegistrationMapper.selectEnforcementRegistrationByUnion(er);
+
+        /** 进行时间筛选, 按需求,查询出来的联合编码想通的时间最早的必须在规定的时间范围类, 否则踢出列表 */
+        // 先把联合编码做成set
+        Set<String> noSet = enforcementRegistrations.stream().map(EnforcementRegistration::getUnionNo).collect(Collectors.toSet());
+        List<String> outNos = new ArrayList<>();
+        for (String no: noSet) {
+            er.setUnionNo(no);
+            int resNum = enforcementRegistrationMapper.outTimeByUnion(er);
+            if (resNum > 0) {
+                outNos.add(no);
+            }
+        }
+        // 使用迭代器移除enforcementRegistrations中unionNo在outNo中存在的对象
+        Iterator<EnforcementRegistration> iterator = enforcementRegistrations.iterator();
+        while (iterator.hasNext()) {
+            EnforcementRegistration obj = iterator.next();
+            if (outNos.contains(obj.getUnionNo())) {
+                iterator.remove();
+            }
+        }
+
         // 分组操作
         Map<String, List<EnforcementRegistration>> groupedByNo = enforcementRegistrations.stream()
                 .collect(Collectors.groupingBy(EnforcementRegistration::getUnionNo));

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

@@ -1115,11 +1115,15 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
                 }else {
                     total = enterpriseComplaints.size();
                 }
-                double per = Double.parseDouble(tmpMap.get("num").toString()) / total * 100;
-                if (Double.isNaN(per)) {
-                    tmpMap.put("per", 0+"%");
+                if (total > 0) {
+                    double per = Double.parseDouble(tmpMap.get("num").toString()) / total * 100;
+                    if (Double.isNaN(per)) {
+                        tmpMap.put("per", 0 + "%");
+                    } else {
+                        tmpMap.put("per", String.format("%.2f", per) + "%");
+                    }
                 } else {
-                    tmpMap.put("per", String.format("%.2f", per)+"%");
+                    tmpMap.put("per", 0 + "%");
                 }
             }
         return results;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -692,6 +692,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lawText != null and lawText != ''"> law_text = #{lawText},</if>
             <if test="unionNo != null  and unionNo != '' and unionNo != '-1'"> union_no = #{unionNo},</if>
             <if test="unionNo != null  and unionNo != '' and unionNo == '-1'"> union_no = null,</if>
+            <if test="uniteCheck != null  and uniteCheck != ''"> unite_check = #{uniteCheck},</if>
             <if test="hasUnion != null"> has_union = #{hasUnion},</if>
             <if test="hasAuto != null"> has_auto = #{hasAuto},</if>
         </trim>
@@ -1096,17 +1097,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
             <if test="checkCss != null  and checkCss != ''"> and DATE_FORMAT(enforcement_time, '%Y-%m-%d') = DATE_FORMAT(#{checkCss}, '%Y-%m-%d')</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                and enforcement_time &gt; #{beginTime}
+                and enforcement_time &gt;= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                and enforcement_time &lt; #{endTime}
+                and enforcement_time &lt;= #{endTime}
             </if>
-            <if test="unionNo != null and unionNo !=''"> or union_no = #{unionNo}</if>
+            <if test="unionNo != null and unionNo !=''"> and union_no = #{unionNo}</if>
             and union_no is not null
         </where>
         order by enforcement_time desc
     </select>
 
+    <select id="outTimeByUnion" parameterType="EnforcementRegistration" resultType="int">
+        select count(1) from enforcement_registration
+        <where>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
+            <if test="checkCss != null  and checkCss != ''"> and DATE_FORMAT(enforcement_time, '%Y-%m-%d') != DATE_FORMAT(#{checkCss}, '%Y-%m-%d')</if>
+            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''"><!-- 开始时间检索 -->
+                and (enforcement_time &lt; #{beginTime} or enforcement_time &gt; #{endTime})
+            </if>
+            <if test="unionNo != null and unionNo !=''"> and union_no = #{unionNo}</if>
+            and union_no is not null
+        </where>
+        order by enforcement_time desc
+    </select>
 
     <update id="updateRegToUnionFlag" parameterType="EnforcementRegistration">
         update enforcement_registration