Merge branch 'dev'

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/enforce/job/WReportDeductVo.java

@@ -88,4 +88,9 @@ public class WReportDeductVo implements Serializable {
     private String userId;
 
 
+    @ApiModelProperty("线索来源（SUPERVISE-内部执法监督,REPORT-举报投诉,RECONSIDERATION-复议、诉讼，" +
+            "PATROL-上级巡察,SUPERVISION-上级督导，上级考评-EVALUATE,FIREINVESTIGATION-火灾事故调查,OTHER-其他工作中）")
+    private String clueResource;
+
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/EnforceObjArchitectureRelateController.java

@@ -128,7 +128,7 @@ public class EnforceObjArchitectureRelateController extends BaseController {
     @GetMapping("/enforceObjArchitectureRelate/architecture/{enforceObjId}")
     public R<List<EnforceObjArchitectureRelate>> getArchitecturelist(@PathVariable String enforceObjId) {
         List<EnforceObjArchitectureRelate> list = enforceObjArchitectureRelateService.list(new LambdaQueryWrapper<EnforceObjArchitectureRelate>()
-                .eq(EnforceObjArchitectureRelate::getEnforceObjId,enforceObjId).groupBy(EnforceObjArchitectureRelate::getRelateType));
+                .eq(EnforceObjArchitectureRelate::getEnforceObjId,enforceObjId));
         list.forEach(e->{
             ArchitectureDTO dto = architectureService.getArchitectureDTO(e.getArchitectureUuid());
             if (dto != null) {
@@ -141,7 +141,7 @@ public class EnforceObjArchitectureRelateController extends BaseController {
     @ApiOperation(value="解除绑定（解除单位和建筑的绑定）")
     @GetMapping("/enforceObjArchitectureRelate/unbind/{id}")
     public R<Boolean> unbind(@PathVariable Long id) {
-        return R.ok(enforceObjArchitectureRelateService.removeById(id));
+        return R.ok(enforceObjArchitectureRelateService.removeArchitectureRelate(id));
     }
 
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceDeductRecordServiceImpl.java

@@ -157,6 +157,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         for (int i = 0; i <= 8; i++) {
                             int v = ((JSONObject)warray.get(i)).getInteger("num" + (i+1));
                             wrongCount += v;
+                            if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
+                                continue;
+                            }
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -197,6 +200,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         for (int i = 0; i <= 11; i++) {
                             int v = ((JSONObject)narray.get(i)).getInteger("wlxNum" + (i+1));
                             wrongCount += v;
+                            if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
+                                continue;
+                            }
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -246,6 +252,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         for (int i = 0; i <= 16; i++) {
                             int v = ((JSONObject)sarray.get(i)).getInteger("wflxNum" + (i+1));
                             wrongCount += v;
+                            if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
+                                continue;
+                            }
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -383,6 +392,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     for (int i = 0; i <= 8; i++) {
                         int v = ((JSONObject)warray.get(i)).getInteger("num" + (i+1));
                         wrongCount += v;
+                        if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
+                            continue;
+                        }
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:
@@ -423,6 +435,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     for (int i = 0; i <= 11; i++) {
                         int v = ((JSONObject)narray.get(i)).getInteger("wlxNum" + (i+1));
                         wrongCount += v;
+                        if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
+                            continue;
+                        }
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:
@@ -472,6 +487,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     for (int i = 0; i <= 16; i++) {
                         int v = ((JSONObject)sarray.get(i)).getInteger("wflxNum" + (i+1));
                         wrongCount += v;
+                        if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
+                            continue;
+                        }
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/EnforceObjArchitectureRelateServiceImpl.java

@@ -119,6 +119,26 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
         return super.updateById(dt);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean removeArchitectureRelate(Long id) {
+        EnforceObjArchitectureRelate relate = this.getById(id);
+        if (relate != null) {
+            EnforceObjArchitectureRelateHis his = new EnforceObjArchitectureRelateHis();
+            SysUser user = SecurityUtils.getLoginUser().getSysUser();
+            his.setEnforceObjId(relate.getEnforceObjId());
+            his.setCreateUserId(user.getUid());
+            his.setCreateUserName(user.getUserName());
+            his.setCreateTime(new Date());
+            his.setBeforeArchitectureId(relate.getArchitectureId());
+            his.setBeforeArchitectureUuid(relate.getArchitectureUuid());
+            his.setBeforeArchitectureName(relate.getArchitectureName());
+            his.setBeforeRelateType(relate.getRelateType());
+            enforceObjArchitectureRelateHisService.save(his);
+        }
+        return super.removeById(id);
+    }
+
     @Override
     public List<EnforceObjCheckDTO> getEnforceObjList(EnforceObjArchitectureRelateQuery query) {
         List<EnforceObjCheckDTO> list = new ArrayList<>();

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/other/IEnforceObjArchitectureRelateService.java

@@ -22,6 +22,7 @@ import java.util.List;
 public interface IEnforceObjArchitectureRelateService extends IService<EnforceObjArchitectureRelate> {
     boolean insertEnforceObjArchitectureRelate(EnforceObjArchitectureRelateAdd add);
     boolean updateEnforceObjArchitectureRelate(EnforceObjArchitectureRelateUpdate param);
+    boolean removeArchitectureRelate(Long id);
     List<EnforceObjCheckDTO> getEnforceObjList(EnforceObjArchitectureRelateQuery query);
     Boolean checkRecordAuth(String regionId);
 

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceDeductRecordMapper.xml

@@ -149,7 +149,7 @@
 
 
     <select id="selectWreportList" resultType="com.zfjg.manage.api.vo.enforce.job.WReportDeductVo">
-        select id,user_id,org_id,org_name,w_user,w_type_c,w_type_t,n_type_c,n_type_t,s_type_c,s_type_t from w_report
+        select id,user_id,org_id,org_name,w_user,w_type_c,w_type_t,n_type_c,n_type_t,s_type_c,s_type_t,clue_resource from w_report
         <where>
             <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
                 and org_id = #{pm.enforceOrgId}

zfjg-modules/zfjg-manage/src/main/resources/mapper/other/EnforceObjArchitectureRelateMapper.xml

@@ -16,7 +16,6 @@
                 and eora.relate_type = #{pm.relateType}
             </if>
         </where>
-        order by eoarh.id desc
     </select>
     <!-- 高楼码关联的单位（包含历史变更记录）   -->
     <select id="getEnforceObjList" resultType="com.zfjg.manage.api.dto.other.EnforceObjCheckDTO">