Merge branch 'V0.0.6' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.6

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskExportVo.java

@@ -32,71 +32,81 @@ public class CoreDrillTaskExportVo {
     @ApiModelProperty(value = "任务名称")
     private String title;
 
+    @ApiModelProperty("地区")
+    @ColumnWidth(15)
+    @ExcelProperty(value = "地区", index = 2)
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    @ColumnWidth(25)
+    @ExcelProperty(value = "行社名称", index = 3)
+    private String affiliatedBank;
+
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练机构", index = 2)
+    @ExcelProperty(value = "演练机构", index = 4)
     @ApiModelProperty(value = "演练机构")
     private String orgName;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练项目", index = 3)
+    @ExcelProperty(value = "演练项目", index = 5)
     @ApiModelProperty(value = "演练项目")
     private String typeText;
 
-    @ExcelProperty(value = "任务进度", index = 4)
+    @ExcelProperty(value = "任务进度", index = 6)
     private String statusText;
 
     @ColumnWidth(42)
-    @ExcelProperty(value = "任务时间", index = 5)
+    @ExcelProperty(value = "任务时间", index = 7)
     @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
 
-    @ExcelProperty(value = "演练地点", index = 6)
+    @ExcelProperty(value = "演练地点", index = 8)
     @ApiModelProperty(value = "演练地点")
     private String drillSite;
 
 
-    @ExcelProperty(value = "指挥人", index = 7)
+    @ExcelProperty(value = "指挥人", index = 9)
     @ApiModelProperty(value = "指挥人")
     private String hostName;
 
-    @ExcelProperty(value = "登记人", index = 8)
+    @ExcelProperty(value = "登记人", index = 10)
     @ApiModelProperty(value = "登记人")
     private String recorderName;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练开始时间", index = 9)
+    @ExcelProperty(value = "演练开始时间", index = 11)
     @ApiModelProperty(value = "演练开始时间")
     private String drillStartTime;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练结束时间", index = 10)
+    @ExcelProperty(value = "演练结束时间", index = 12)
     @ApiModelProperty(value = "演练结束时间")
     private String drillEndTime;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "预设案由", index = 11)
+    @ExcelProperty(value = "预设案由", index = 13)
     @ApiModelProperty(value = "预设案由")
     private String presetCase;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "演练情况", index = 12)
+    @ExcelProperty(value = "演练情况", index = 14)
     @ApiModelProperty(value = "演练情况")
     private String drillSituation;
 
-    @ExcelProperty(value = "参会人员", index = 13)
+    @ExcelProperty(value = "参会人员", index = 15)
     @ApiModelProperty(value = "参与人员名称")
     private String taskUserNames;
 
-    @ExcelProperty(value = "缺席人员", index = 14)
+    @ExcelProperty(value = "缺席人员", index = 16)
     @ApiModelProperty(value = "缺席人员名称")
     private String absenceNames;
 
-    @ExcelProperty(value = "评分", index = 15)
+    @ExcelProperty(value = "评分", index = 17)
     @ApiModelProperty(value = "评分")
     private Integer commentScore;
 
-    @ExcelProperty(value = "评语", index = 16)
+    @ExcelProperty(value = "评语", index = 18)
     @ApiModelProperty(value = "评语")
     private String comment;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskPageVo.java

@@ -33,6 +33,13 @@ public class CoreDrillTaskPageVo {
 
     private Integer orgType;
 
+
+    @ApiModelProperty("地区")
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    private String affiliatedBank;
+
     @ApiModelProperty(value = "机构名称")
     private String orgName;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskExportVo.java

@@ -23,52 +23,62 @@ public class CoreEduTrainingTaskExportVo {
     @ApiModelProperty(value = "任务名称")
     private String title;
 
+    @ApiModelProperty("地区")
+    @ExcelProperty(value ="地区", index = 2)
+    @ColumnWidth(20)
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    @ExcelProperty(value ="行社名称",index = 3)
+    @ColumnWidth(20)
+    private String affiliatedBank;
+
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "受训机构", index = 2)
+    @ExcelProperty(value = "受训机构", index = 4)
     @ApiModelProperty(value = "受训机构")
     private String orgName;
 
-    @ExcelProperty(value = "任务进度", index = 3)
+    @ExcelProperty(value = "任务进度", index = 5)
     private String statusText;
 
     @ColumnWidth(35)
-    @ExcelProperty(value = "任务时间", index = 4)
+    @ExcelProperty(value = "任务时间", index = 6)
     @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
 
-    @ExcelProperty(value = "主持人", index = 5)
+    @ExcelProperty(value = "主持人", index = 7)
     @ApiModelProperty(value = "主持人名称")
     private String hostName;
 
-    @ExcelProperty(value = "登记人", index = 6)
+    @ExcelProperty(value = "登记人", index = 8)
     @ApiModelProperty(value = "记录人名称")
     private String recorderName;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "培训开始时间", index = 7)
+    @ExcelProperty(value = "培训开始时间", index =9)
     @ApiModelProperty(value = "培训开始时间")
     private String trainingStartDateTime;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "培训结束时间", index = 8)
+    @ExcelProperty(value = "培训结束时间", index = 10)
     @ApiModelProperty(value = "培训结束时间")
     private String trainingEndDateTime;
 
-    @ExcelProperty(value = "培训内容", index = 9)
+    @ExcelProperty(value = "培训内容", index = 11)
     @ApiModelProperty(value = "内容")
     private String content;
 
-    @ExcelProperty(value = "培训总结", index = 10)
+    @ExcelProperty(value = "培训总结", index = 12)
     @ApiModelProperty(value = "总结")
     private String note;
 
-    @ExcelProperty(value = "参会人员", index = 11)
+    @ExcelProperty(value = "参会人员", index = 13)
     @ApiModelProperty(value = "参与人员名称")
     private String taskUserNames;
 
-    @ExcelProperty(value = "缺席人员", index = 12)
+    @ExcelProperty(value = "缺席人员", index = 14)
     @ApiModelProperty(value = "缺席人员名称")
     private String absenceNames;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskPageVo.java

@@ -1,5 +1,7 @@
 package com.xunmei.common.core.domain.edu.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToRole;
@@ -24,6 +26,13 @@ public class CoreEduTrainingTaskPageVo {
     @ApiModelProperty(value = "机构")
     private Long orgId;
 
+    @ApiModelProperty("地区")
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    private String affiliatedBank;
+
+
     @ApiModelProperty(value = "机构名称")
     private String orgName;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterVo.java

@@ -81,6 +81,7 @@ public class CoreIntroduceLetterVo {
     private String orgName;
 
 
+
     @ApiModelProperty(value = "状态：0 草稿 ，1 使用中， 2 已逾期")
     private Integer status;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreOutInRecordVo.java

@@ -1,5 +1,7 @@
 package com.xunmei.common.core.domain.letter.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xunmei.common.core.web.domain.BaseEntity;
@@ -83,6 +85,12 @@ public class CoreOutInRecordVo{
     @ApiModelProperty(value = "出入机构")
     private Long orgId;
 
+    @ApiModelProperty(value = "地区")
+    private String affiliatedArea;
+
+    @ApiModelProperty(value = "行社名称")
+    private String affiliatedBank;
+
     private String orgName;
     /**
      * 陪同人员

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskExcelVo.java

@@ -2,6 +2,7 @@ package com.xunmei.common.core.domain.retrieval.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -27,12 +28,14 @@ public class CoreMonitoringRetrievalTaskExcelVo {
      * 序号
      */
     @ExcelProperty("序号")
+    @ColumnWidth(10)
     private Integer orderNum;
 
     /**
      * 任务名称
      */
     @ExcelProperty("任务名称")
+    @ColumnWidth(20)
     private String taskName;
 
     /**
@@ -43,6 +46,7 @@ public class CoreMonitoringRetrievalTaskExcelVo {
     private String status;
 
     @ExcelProperty("任务进度")
+    @ColumnWidth(20)
     private String statusText;
     /**
      * 调阅周期
@@ -53,12 +57,14 @@ public class CoreMonitoringRetrievalTaskExcelVo {
 
     @ExcelIgnore
     @ExcelProperty("调阅周期")
+    @ColumnWidth(20)
     private String cycleText;
     /**
      * 开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ExcelProperty("开始时间")
+    @ColumnWidth(20)
     private Date planStartTime;
 
     /**
@@ -66,12 +72,25 @@ public class CoreMonitoringRetrievalTaskExcelVo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ExcelProperty("截止时间")
+    @ColumnWidth(20)
     private Date planEndTime;
 
+
+    @ApiModelProperty("地区")
+    @ExcelProperty("地区")
+    @ColumnWidth(20)
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    @ExcelProperty("行社名称")
+    @ColumnWidth(20)
+    private String affiliatedBank;
+
     /**
      * 调阅机构
      */
     @ExcelProperty("调阅机构")
+    @ColumnWidth(20)
     private String orgName;
 
 
@@ -81,11 +100,13 @@ public class CoreMonitoringRetrievalTaskExcelVo {
      * 调阅角色
      */
     @ExcelProperty("调阅人员")
+    @ColumnWidth(20)
     private String roleName;
     /**
      * 调阅人
      */
     @ExcelProperty("登记人")
+    @ColumnWidth(20)
     private String retrievalUserName;
 
     /**
@@ -93,6 +114,7 @@ public class CoreMonitoringRetrievalTaskExcelVo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ExcelProperty("调阅开始时间")
+    @ColumnWidth(20)
     private Date startTime;
 
     /**
@@ -101,10 +123,12 @@ public class CoreMonitoringRetrievalTaskExcelVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ExcelProperty("调阅结束时间")
+    @ColumnWidth(20)
     private Date endTime;
 
 
     @ExcelProperty("异常数量")
+    @ColumnWidth(20)
     private Integer exceptionCount;
 
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskVo.java

@@ -1,5 +1,7 @@
 package com.xunmei.common.core.domain.retrieval.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -44,6 +46,12 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     @ApiModelProperty(value = "任务名称")
     private String taskName;
 
+    @ApiModelProperty("地区")
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    private String affiliatedBank;
+
     /**
      * 调阅机构
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/mapper/CockpitMapper.java

@@ -29,7 +29,7 @@ public interface CockpitMapper extends BaseMapper {
 
     VisitInfoVo currentMonthVisitInfo(@Param("orgPath") String orgPath, @Param("startDate") Date startDate);
 
-    QuestionStatisticVo question(@Param("date") Date start,@Param("orgPath") String orgPath);
+//    QuestionStatisticVo question(@Param("date") Date start,@Param("orgPath") String orgPath);
 
     /**
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/domain/Question.java

@@ -2,6 +2,8 @@ package com.xunmei.core.question.domain;
 
 import java.util.Date;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -153,6 +155,21 @@ public class Question extends BaseEntity {
     @ApiModelProperty(value = "整改期限")
     private Date reformDeadline;
 
+
+    /**
+     * 受检机构所属地区
+     */
+    @ApiModelProperty(value = "机构所属地区")
+    @TableField(exist = false)
+    private String affiliatedArea;
+
+    /**
+     * 受检机构所属行社
+     */
+    @ApiModelProperty(value = "机构所属行社")
+    @TableField(exist = false)
+    private String affiliatedBank;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionExportDto.java

@@ -16,11 +16,21 @@ public class QuestionExportDto {
     @ExcelProperty(value="序号",index = 0)
     private Integer index;
 
+    @ApiModelProperty(value = "地区")
+    @ExcelProperty(value="地区",index = 1)
+    @ColumnWidth(10)
+    private String affiliatedArea;
+
+    @ApiModelProperty(value = "行社名称")
+    @ExcelProperty(value="行社名称",index = 2)
+    @ColumnWidth(20)
+    private String affiliatedBank;
+
     /**
      * 隐患所属机构名称
      */
     @ApiModelProperty(value = "隐患所属机构名称")
-    @ExcelProperty(value="机构名称",index = 1)
+    @ExcelProperty(value="机构名称",index = 3)
     @ColumnWidth(20)
     private String orgName;
 
@@ -28,14 +38,14 @@ public class QuestionExportDto {
      * 来源任务名称
      */
     @ApiModelProperty(value = "来源任务名称")
-    @ExcelProperty(value="隐患来源",index = 2)
+    @ExcelProperty(value="隐患来源",index = 4)
     @ColumnWidth(20)
     private String srcTaskName;
 
     /**
      检查、履职项名称
      */
-    @ExcelProperty(value="标准项",index = 3)
+    @ExcelProperty(value="标准项",index = 5)
     @ColumnWidth(20)
     private String checkItem;
 
@@ -43,7 +53,7 @@ public class QuestionExportDto {
      * 检查内容
      */
     @ApiModelProperty(value = "检查内容")
-    @ExcelProperty(value="标准依据",index = 4)
+    @ExcelProperty(value="标准依据",index = 6)
     @ColumnWidth(40)
     private String checkContent;
 
@@ -51,7 +61,7 @@ public class QuestionExportDto {
      * 隐患描述
      */
     @ApiModelProperty(value = "隐患描述")
-    @ExcelProperty(value="隐患描述",index = 5)
+    @ExcelProperty(value="隐患描述",index = 7)
     @ColumnWidth(20)
     private String questionDesc;
 
@@ -59,7 +69,7 @@ public class QuestionExportDto {
      * 提出人名称
      */
     @ApiModelProperty(value = "提出人名称")
-    @ExcelProperty(value="提出人",index = 6)
+    @ExcelProperty(value="提出人",index = 8)
     @ColumnWidth(15)
     private String submitorName;
 
@@ -68,7 +78,7 @@ public class QuestionExportDto {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "发现时间")
-    @ExcelProperty(value="发现时间",index = 7)
+    @ExcelProperty(value="发现时间",index = 9)
     @ColumnWidth(22)
     private Date submitTime;
 
@@ -76,7 +86,7 @@ public class QuestionExportDto {
      * 整改期限
      */
     @ApiModelProperty(value = "整改期限")
-    @ExcelProperty(value="整改期限",index = 8)
+    @ExcelProperty(value="整改期限",index = 10)
     @ColumnWidth(12)
     @DateTimeFormat("yyyy-MM-dd")
     private Date reformDeadline;
@@ -87,49 +97,49 @@ public class QuestionExportDto {
     /**
      * 确认状态
      */
-    @ExcelProperty(value="确认状态",index = 9)
+    @ExcelProperty(value="确认状态",index = 11)
     @ColumnWidth(15)
     private String confirmStatusText;
 
     /**
      * 确认人
      */
-    @ExcelProperty(value="确认人",index = 10)
+    @ExcelProperty(value="确认人",index = 12)
     @ColumnWidth(15)
     private String confirmorName;
 
     /**
      * 确认描述
      */
-    @ExcelProperty(value="异议内容",index = 11)
+    @ExcelProperty(value="异议内容",index = 13)
     @ColumnWidth(15)
     private String confirmDesc;
 
     /**
      * 异议审批状态
      */
-    @ExcelProperty(value="审核结果",index = 12)
+    @ExcelProperty(value="审核结果",index = 14)
     @ColumnWidth(15)
     private String dissentStatusText;
 
     /**
      * 审核人
      */
-    @ExcelProperty(value="审核人",index = 13)
+    @ExcelProperty(value="审核人",index = 15)
     @ColumnWidth(15)
     private String dissenterName;
 
     /**
      * 审核描述
      */
-    @ExcelProperty(value="审核描述",index = 14)
+    @ExcelProperty(value="审核描述",index = 16)
     @ColumnWidth(15)
     private String dissentDesc;
 
     /**
      * 整改日期
      */
-    @ExcelProperty(value="整改时间",index = 15)
+    @ExcelProperty(value="整改时间",index = 17)
     @ColumnWidth(15)
     @DateTimeFormat("yyyy-MM-dd")
     private Date reformDate;
@@ -137,14 +147,14 @@ public class QuestionExportDto {
     /**
      * 整改状态
      */
-    @ExcelProperty(value="整改状态",index = 16)
+    @ExcelProperty(value="整改状态",index = 18)
     @ColumnWidth(15)
     private String reformStatusText;
 
     /**
      * 整改描述
      */
-    @ExcelProperty(value="描述",index = 17)
+    @ExcelProperty(value="描述",index = 19)
     @ColumnWidth(15)
     private String reformDesc;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -76,36 +76,12 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
         Boolean isPage = Boolean.FALSE;
 
         String strDate = DateUtil.format(new Date(), "yyyy-MM-dd");
- /*       String orgKey = "resumptionRecordOrgList" + strDate;
-        Object objOrg = redisTemplate.opsForValue().get(orgKey);
-        List<Org> orgList = null;
-        if (ObjectUtil.isNotEmpty(objOrg)) {
-            orgList = JSON.parseArray(objOrg.toString(), Org.class);
-        } else {
-            orgList = orgService.all();
-            if (CollectionUtils.isNotEmpty(orgList)) {
-                this.redisTemplate.opsForValue().set(orgKey, JSON.toJSONString(orgList));
-                //设置过期时间24小时
-                this.redisTemplate.expire(orgKey, 24, TimeUnit.HOURS);
-            }
-        }*/
         if (pageDto.getCheckSub()) {
             List<Long> orgList = orgService.selectCheckSubOrgIdList(pageDto.getOrgId(), SecurityConstants.INNER);
             pageDto.setOrgIdList(orgList);
             pageDto.setOrgId(null);
         }
 
-//        if (pageDto.getCheckSub() && ObjectUtil.isNotEmpty(pageDto.getOrgId())) {
-//            final Org org = orgService.find(pageDto.getOrgId());
-//            pageDto.setOrgId(null);
-//            List<Long> orgIds = new ArrayList<>();
-//            orgList.forEach(org1 -> {
-//                if (org1.getPath().contains(org.getPath())) {
-//                    orgIds.add(org1.getId());
-//                }
-//            });
-//            pageDto.setOrgIdList(orgIds);
-//        }
         final HashMap<String, Object> hashMap = new HashMap<>();
         Set<Integer> ymdQuarters = new HashSet<>();
         Boolean isTime = Boolean.FALSE;
@@ -132,60 +108,12 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
             }
             hashMap.put("startYear", startYear);
             hashMap.put("endYear", endYear);
-            hashMap.put("startDate", DateUtil.format(startDate,"yyyy-MM-dd HH:mm:ss"));
-            hashMap.put("endDate", DateUtil.format(endDate,"yyyy-MM-dd HH:mm:ss"));
-//            switch (pageDto.getExecuteCycle()) {
-//                case 1:
-//                case 2:
-//                 /*   hashMap.put("startDate", DateUtil.formatDate(startDate));
-//                    hashMap.put("endDate", DateUtil.formatDate(endDate));*/
-//                    break;
-//                case 3:
-//                    //每周履职
-//                    startCalendar.setMinimalDaysInFirstWeek(6);
-//                    int startWeek = startCalendar.get(Calendar.WEEK_OF_YEAR);
-//                    hashMap.put("startWeek", String.valueOf(startWeek));
-//                    //hashMap.put("endWeek", String.valueOf(endWeek));
-//                    break;
-//                case 4:
-//                    //每月履职
-//                    int startMonth = startCalendar.get(Calendar.MONTH) + 1;
-//                    int endMonth = endCalendar.get(Calendar.MONTH) + 1;
-//                   /* hashMap.put("startMonth", String.valueOf(startMonth));
-//                    hashMap.put("endMonth", String.valueOf(endMonth));*/
-//                    hashMap.put("startMonth", DateUtil.format(startCalendar.getTime(), "yyyy-MM-dd"));
-//                    hashMap.put("endMonth", DateUtil.format(endCalendar.getTime(), "yyyy-MM-dd"));
-//                    break;
-//                case 5:
-//                    //每季度履职
-//                    int startQuarter = getCurrentQuarter(startDate);
-//                    int endQuarter = getCurrentQuarter(endDate);
-//                    hashMap.put("startQuarter", String.valueOf(startQuarter));
-//                    hashMap.put("endQuarter", String.valueOf(endQuarter));
-//                    break;
-//                case 6:
-//                    //每半年履职
-//                    int startHalfYear = getCurrentHalfYear(startDate);
-//                    int endHalfYear = getCurrentHalfYear(endDate);
-//                    hashMap.put("startHalfYear", String.valueOf(startHalfYear));
-//                    hashMap.put("endHalfYear", String.valueOf(endHalfYear));
-//                    break;
-//                default:
-//                    break;
-//            }
+            hashMap.put("startDate", DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss"));
+            hashMap.put("endDate", DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss"));
         }
-
-//        if (isPage) {
-//            RESUMPTIONOVERVIEWLOG.info("履职记录查询,查询条件: pageDto: {},hashMap:{},isTime:{}", JSON.toJSONString(pageDto), JSON.toJSONString(hashMap), isTime);
         page = baseMapper.selectPageByCondition(page, pageDto, hashMap, isTime, ymdQuarters);
         dealData(page.getRecords());
         return TableDataInfo.success(page);
-//        } else {
-////            RESUMPTIONOVERVIEWLOG.info("履职记录导出,查询条件: pageDto: {},hashMap:{}", JSON.toJSONString(pageDto), JSON.toJSONString(hashMap));
-//            final List<ResumptionRecordPageVo> list = resumptionRecordMapper.selectListByCondition(pageDto, hashMap, isTime, ymdQuarters);
-//            dealData(list, orgList, strDate);
-//            return list;
-//        }
     }
 
 
@@ -193,38 +121,9 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
         if (list.size() < 1) {
             return;
         }
-//        String roleKey = "resumptionRecordRoleList" + strDate;
-//        BoundValueOperations<String, String> boundValueOps = redisTemplate.boundValueOps(roleKey);
-//        String s = boundValueOps.get();
-//        List<Role> roleList = null;
-//        if (ObjectUtil.isNotEmpty(s)) {
-//            roleList = JSON.parseArray(s, Role.class);
-//        } else {
-//            roleList = objectMapper.selectAllRole();
-//            if (CollectionUtils.isNotEmpty(list)) {
-//                boundValueOps.set(JSON.toJSONString(roleList));
-//                boundValueOps.expireAt(DateUtil.endOfDay(new Date()));
-//            }
-//        }
-
-   /*=    String planKey = "resumptionRecordPlanList"+strDate;
-        BoundValueOperations<String, String> operations = redisTemplate.boundValueOps(planKey);
-        String objPlan = operations.get();
-        List<AppPlan> planList =null;
-        if(ObjectUtil.isNotEmpty(objPlan)) {
-            planList = JSON.parseArray(objPlan,AppPlan.class);
-        }else{
-            planList =objectMapper.selectAllPlan();
-            if(CollectionUtils.isNotEmpty(list)){
-                operations.set(JSON.toJSONString(list));
-                operations.expireAt(DateUtil.endOfDay(new Date()));
-            }
-        }*/
-
-//        List<IdNameVo> planList = appPlanMapper.selectPlanNames(list.stream().map(i -> i.getPlanId()).distinct().collect(Collectors.toList()));
-        List<IdNameVo> orgNames = orgService.getParentName(list.stream()
+       /* List<IdNameVo> orgNames = orgService.getParentName(list.stream()
                         .map(i -> i.getOrgId()).distinct().collect(Collectors.toList()), SecurityConstants.INNER)
-                .getData();
+                .getData();*/
 
 
         LambdaQueryWrapper<AppPlanToRole> prWrapper = new LambdaQueryWrapper<>();
@@ -236,20 +135,15 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
                 .ids(prMapper.stream().map(i -> i.getRoleId()).distinct().collect(Collectors.toList())).build());
         list.stream().filter(pageVo -> ObjectUtil.equal(pageVo.getStatus(), "1")).forEach(pageVo -> pageVo.setSubmitter(null));
 
-        //List<Org> orgList = orgService.all();
         for (ResumptionRecordPageVo vo : list) {
-            if (ObjectUtil.isNotEmpty(orgNames)) {
+            /*if (ObjectUtil.isNotEmpty(orgNames)) {
                 Optional<IdNameVo> org = orgNames.stream().filter(i -> ObjectUtil.equal(vo.getOrgId(), i.getId())).findFirst();
                 if (org.isPresent()) {
                     vo.setOrgName(org.get().getName());
                     vo.setParentOrgName(org.get().getExtra());
                 }
-            }
+            }*/
 
-//            Optional<IdNameVo> plan=planList.stream().filter(i -> ObjectUtil.equal(vo.getPlanId(), i.getId())).findFirst();
-//            if (plan.isPresent()) {
-//                vo.setPlanName(plan.get().getName());
-//            }
             List<Long> roleIds = prMapper.stream().filter(pr -> ObjectUtil.equal(pr.getPlanId(), vo.getPlanId()))
                     .map(AppPlanToRole::getRoleId)
                     .collect(Collectors.toList());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/protection/ProtectionPageVo.java

@@ -3,11 +3,6 @@ package com.xunmei.core.resumption.vo.protection;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.converters.AutoConverter;
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.excel.metadata.GlobalConfiguration;
-import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.util.internal.ObjectUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -37,13 +32,23 @@ public class ProtectionPageVo {
     @ExcelIgnore
     private String orgId;
 
+    @ApiModelProperty("地区")
+    @ExcelProperty(value="地区",index = 1)
+    @ColumnWidth(20)
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    @ExcelProperty(value="行社名称",index = 2)
+    @ColumnWidth(20)
+    private String affiliatedBank;
+
     @ApiModelProperty("机构名称")
-    @ExcelProperty(value = "所属机构",index = 1)
+    @ExcelProperty(value = "所属机构",index = 3)
     @ColumnWidth(20)
     private String orgName;
 
     @ApiModelProperty("防区的名称")
-    @ExcelProperty(value = "报警控制器名称",index = 2)
+    @ExcelProperty(value = "报警控制器名称",index = 4)
     @ColumnWidth(20)
     private String name;
 
@@ -52,7 +57,7 @@ public class ProtectionPageVo {
     private String status;
 
     @ApiModelProperty("防区状态")
-    @ExcelProperty(value = "报警控制器状态",index = 3)
+    @ExcelProperty(value = "报警控制器状态",index = 5)
     @ColumnWidth(20)
     private String statusText;
 
@@ -67,7 +72,7 @@ public class ProtectionPageVo {
     /**
      * 登记人姓名
      */
-    @ExcelProperty(value = "登记人",index = 4)
+    @ExcelProperty(value = "登记人",index = 6)
     @ColumnWidth(15)
     private String statusUpdatorName;
 
@@ -75,7 +80,7 @@ public class ProtectionPageVo {
      * 布撤防时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @ExcelProperty(value = "最近登记时间",index = 5)
+    @ExcelProperty(value = "最近登记时间",index = 7)
     @ColumnWidth(20)
     private  Date statusUpdateTime;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/ResumptionRecordPageVo.java

@@ -41,13 +41,13 @@ public class ResumptionRecordPageVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("任务开始时间")
-    @ExcelProperty(value ="开始时间",index=5)
+    @ExcelProperty(value ="开始时间",index=7)
     @ColumnWidth(30)
     private Date planStartTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value ="截止时间")
-    @ExcelProperty(value ="截止时间",index = 6)
+    @ExcelProperty(value ="截止时间",index = 8)
     @ColumnWidth(30)
     private Date planEndTime;
 
@@ -61,8 +61,19 @@ public class ResumptionRecordPageVo {
     @ExcelIgnore
     private String parentOrgName;
 
+    @ApiModelProperty("地区")
+    @ExcelProperty(value="地区",index = 2)
+    @ColumnWidth(20)
+    private String affiliatedArea;
+
+    @ApiModelProperty("行社名称")
+    @ExcelProperty(value="行社名称",index = 3)
+    @ColumnWidth(20)
+    private String affiliatedBank;
+
+
     @ApiModelProperty("机构名称")
-    @ExcelProperty(value="履职机构",index = 2)
+    @ExcelProperty(value="履职机构",index = 4)
     @ColumnWidth(20)
     private String orgName;
 
@@ -71,23 +82,23 @@ public class ResumptionRecordPageVo {
     private Long roleId;
 
     @ApiModelProperty("履职角色")
-    @ExcelProperty(value="履职人员",index = 3)
+    @ExcelProperty(value="履职人员",index = 5)
     @ColumnWidth(20)
     private String roleName;
 
     @ApiModelProperty("提交人")
-    @ExcelProperty(value = "登记人",index = 7)
+    @ExcelProperty(value = "登记人",index = 9)
     @ColumnWidth(15)
     private String submitter;
 
     @ApiModelProperty("提交时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelProperty(value = "登记时间",index = 8)
+    @ExcelProperty(value = "登记时间",index = 10)
     @ColumnWidth(20)
     private Date submitTime;
 
     @ApiModelProperty("隐患数量")
-    @ExcelProperty(value = "隐患问题数",index = 9)
+    @ExcelProperty(value = "隐患问题数",index = 11)
     @ColumnWidth(15)
     private Integer abnormalDataNums;
 
@@ -96,7 +107,7 @@ public class ResumptionRecordPageVo {
     private String status;
 
     @JsonIgnore
-    @ExcelProperty(value = "任务进度",index = 4)
+    @ExcelProperty(value = "任务进度",index = 6)
     @ColumnWidth(15)
     private String statusText;
 
@@ -111,6 +122,11 @@ public class ResumptionRecordPageVo {
      */
     @ExcelIgnore
     private Integer quarter;
+
+
+
+
+
 //    @ApiModelProperty("二级机构")
 //    private String secondaryOrgName;
 //

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -141,8 +141,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         if (ObjectUtil.isEmpty(list)) {
             throw new RuntimeException("导出数据为空!");
         }
-        if (list.size() > 10000) {
-            throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
+        if (list.size() > 50000) {
+            throw new RuntimeException("导出数据量过大（单次导出限量50000条数据），请填写条件分批导出");
         }
         for (int i = 0; i < list.size(); i++) {
             CoreMonitoringRetrievalTaskExcelVo vo = list.get(i);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafetyTask.java

@@ -3,6 +3,8 @@ package com.xunmei.core.safetyCheck.domain;
 import java.util.Date;
 import java.util.List;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -66,19 +68,14 @@ public class CoreSafetyTask extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    /**
-     * 受检机构所属地区
-     */
-    @ApiModelProperty(value = "受检机构所属地区")
+
+    @ApiModelProperty("地区")
     @TableField(exist = false)
-    private String dqOrgName;
+    private String affiliatedArea;
 
-    /**
-     * 受检机构所属行社
-     */
-    @ApiModelProperty(value = "受检机构所属行社")
+    @ApiModelProperty("行社名称")
     @TableField(exist = false)
-    private String hsOrgName;
+    private String affiliatedBank;
 
     /**
      * 受检机构

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -103,8 +103,6 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         page = coreSafetyTaskMapper.selectCoreSafetyTaskPage(page, coreSafetyTask);
         if (CollectionUtil.isNotEmpty(page.getRecords())) {
             List<Long> planIds = page.getRecords().stream().map(r -> r.getPlanId()).distinct().collect(Collectors.toList());
-            Map<Long, SysOrg> dqAndHs = remoteOrgService.selectDqAndHs(SecurityConstants.INNER)
-                    .stream().collect(Collectors.toMap(SysOrg::getId, o -> o));
 
             List<Long> tempTaskRoldIds = page.getRecords().stream().filter(r -> ObjectUtil.equal(r.getSourceType(), SafetyTaskSourceType.TempTask.getCode().longValue())).map(r -> r.getRoleId()).distinct().collect(Collectors.toList());
             final List<IdNameVo> tempTaskRoles = new ArrayList();
@@ -134,26 +132,6 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
                         r.getRoles().add(roleVo);
                     }
                 }
-
-                if (ObjectUtil.isNotEmpty(r.getOrgPath())) {
-                    List<Long> ids = Arrays.stream(r.getOrgPath().split("-"))
-                            .filter(id -> NumberUtil.isLong(id))
-                            .map(id -> NumberUtil.parseLong(id))
-                            .collect(Collectors.toList());
-
-                    for (Long id : ids) {
-                        if (!dqAndHs.containsKey(id)) {
-                            continue;
-                        }
-
-                        SysOrg org = dqAndHs.get(id);
-                        if (ObjectUtil.equal(org.getType(), OrgTypeEnum.HANG_SHE.getCode())) {
-                            r.setHsOrgName(org.getShortName());
-                        } else if (StringUtils.endsWith(org.getShortName(), "地区行社")) {
-                            r.setDqOrgName(org.getShortName());
-                        }
-                    }
-                }
             });
         }
 
@@ -303,33 +281,9 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         if (ObjectUtil.isNotEmpty(list)) {
             AtomicInteger xh = new AtomicInteger();
             xh.getAndIncrement();
-            if (list.size() > 10000) {
+            if (list.size() > 50000) {
                 throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
             }
-            Map<Long, SysOrg> dqAndHs = remoteOrgService.selectDqAndHs(SecurityConstants.INNER)
-                    .stream().collect(Collectors.toMap(SysOrg::getId, o -> o));
-            list.forEach(e -> {
-                e.setIndex(xh.getAndIncrement());
-                if (ObjectUtil.isNotEmpty(e.getOrgPath())) {
-                    List<Long> ids = Arrays.stream(e.getOrgPath().split("-"))
-                            .filter(id -> NumberUtil.isLong(id))
-                            .map(id -> NumberUtil.parseLong(id))
-                            .collect(Collectors.toList());
-
-                    for (Long id : ids) {
-                        if (!dqAndHs.containsKey(id)) {
-                            continue;
-                        }
-
-                        SysOrg org = dqAndHs.get(id);
-                        if (ObjectUtil.equal(org.getType(), OrgTypeEnum.HANG_SHE.getCode())) {
-                            e.setHsOrgName(org.getShortName());
-                        } else if (StringUtils.endsWith(org.getShortName(), "地区行社")) {
-                            e.setDqOrgName(org.getShortName());
-                        }
-                    }
-                }
-            });
         }
 
         return list;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/CoreSafetyTaskExport.java

@@ -47,15 +47,17 @@ public class CoreSafetyTaskExport {
      * 受检机构所属地区
      */
     @ApiModelProperty(value = "受检机构所属地区")
-    @ExcelProperty(value = "所属地区", index = 5)
-    private String dqOrgName;
+    @ExcelProperty(value = "地区", index = 5)
+    @ColumnWidth(15)
+    private String affiliatedArea;
 
     /**
      * 受检机构所属行社
      */
     @ApiModelProperty(value = "受检机构所属行社")
-    @ExcelProperty(value = "行社", index = 6)
-    private String hsOrgName;
+    @ExcelProperty(value = "行社名称", index = 6)
+    @ColumnWidth(20)
+    private String affiliatedBank;
 
     @ApiModelProperty(value = "受检机构")
     @ExcelProperty(value = "受检机构", index = 7)

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -197,17 +197,17 @@
         where arrival_time >= #{startDate}
           and o.path LIKE CONCAT(#{orgPath}, '%')
     </select>
-    <select id="question" resultType="com.xunmei.core.board.vo.web.QuestionStatisticVo">
-        SELECT count(0)                                          as                              total,
-               sum(case confirm_status when 0 then 1 else 0 end) as                              unconfirm,
-               sum(case confirm_status when 1 then 1 else 0 end) as                              auditing,
-               sum(case confirm_status when 2 then 1 else 0 end) as                              unreform,
-               sum(case confirm_status when 3 then (if(reform_status is null, 1, 0)) else 0 end) notQuestion,
-               sum(case reform_status when 11 then 1 else 0 end)                                 reformed
-        FROM core_question
-        WHERE submit_time >= #{date}
-          and org_path like CONCAT(#{orgPath}, '%');
-    </select>
+<!--    <select id="question" resultType="com.xunmei.core.board.vo.web.QuestionStatisticVo">-->
+<!--        SELECT count(0)                                          as                              total,-->
+<!--               sum(case confirm_status when 0 then 1 else 0 end) as                              unconfirm,-->
+<!--               sum(case confirm_status when 1 then 1 else 0 end) as                              auditing,-->
+<!--               sum(case confirm_status when 2 then 1 else 0 end) as                              unreform,-->
+<!--               sum(case confirm_status when 3 then (if(reform_status is null, 1, 0)) else 0 end) notQuestion,-->
+<!--               sum(case reform_status when 11 then 1 else 0 end)                                 reformed-->
+<!--        FROM core_question-->
+<!--        WHERE submit_time >= #{date}-->
+<!--          and org_path like CONCAT(#{orgPath}, '%');-->
+<!--    </select>-->
 
 
     <select id="selectQuestion" resultType="com.xunmei.core.board.dto.web.WebSyntheticQuestionDto">

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -21,7 +21,9 @@
         c.short_name as orgName,
         a.all_hour as allHour,
         a.status_update_time as statusUpdateTime,
-        a.status_updator_name as statusUpdatorName
+        a.status_updator_name as statusUpdatorName,
+        c.affiliated_area ,
+        c.affiliated_bank
         from core_protection a
         inner join sys_org c on a.org_id = c.id and c.deleted=0
         <if test="request.checkSub==true">

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -64,10 +64,32 @@
 
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskPageVo"
             parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
-        select t.id, plan_id, t.org_id, t.org_name, title, type as type, status,rec_status, host_id,u.name as hostName,
-        start_date, end_date, t.drill_start_time,t.drill_end_time, t.pdf_url as pdfUrl,
-        drill_site as drillSite,comment_score as commentScore,comment,category
-        from core_drill_task t left join sys_user u on t.host_id=u.id
+        SELECT
+        t.id,
+        t.plan_id,
+        t.org_id,
+        t.org_name,
+        t.title,
+        t.type,
+        t.STATUS,
+        t.rec_status,
+        t.host_id,
+        u.NAME AS hostName,
+        t.start_date,
+        t.end_date,
+        t.drill_start_time,
+        t.drill_end_time,
+        t.pdf_url AS pdfUrl,
+        t.drill_site AS drillSite,
+        t.comment_score AS commentScore,
+        t.COMMENT,
+        t.category ,
+        d.affiliated_area,
+        d.affiliated_bank
+        FROM
+        core_drill_task t
+        LEFT JOIN sys_user u ON t.host_id = u.id
+        LEFT JOIN sys_org d ON t.org_id = d.id
         <where>
             <choose>
                 <when test="request.checkSub==true">

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -66,9 +66,27 @@
 
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo"
             parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
-        select t.id, plan_id, t.org_id, t.org_name, title, status, host_id,u.name as hostName,type,
-        start_date, end_date, t.training_start_date_time,t.training_end_date_time, t.pdf_url as pdfUrl
-        from core_edu_training_task t left join sys_user u on t.host_id=u.id
+        SELECT
+        t.id,
+        t.plan_id,
+        t.org_id,
+        t.org_name,
+        t.title,
+        t.STATUS,
+        t.host_id,
+        u.NAME AS hostName,
+        t.type,
+        t.start_date,
+        t.end_date,
+        t.training_start_date_time,
+        t.training_end_date_time,
+        t.pdf_url AS pdfUrl,
+        d.affiliated_area,
+        d.affiliated_bank
+        FROM
+        core_edu_training_task t
+        LEFT JOIN sys_user u ON t.host_id = u.id
+        LEFT JOIN sys_org d ON t.org_id = d.id
         <where>
             <choose>
                 <when test="request.checkSub==true">
@@ -234,9 +252,12 @@
         t.training_start_date_time,
         t.training_end_date_time,
         content,
-        t.note
+        t.note,
+        d.affiliated_area ,
+        d.affiliated_bank
         from core_edu_training_task t left join sys_user u on t.host_id=u.id
         left join sys_user u1 on t.recorder_id=u1.id
+        left join sys_org d on t.org_id = d.id
         <where>
             <choose>
                 <when test="request.checkSub==true">

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -46,8 +46,11 @@
     </select>
     <select id="selectPageList"
             resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterVo">
-        select * from core_introduce_letter a where deleted=0
-
+        SELECT
+        a.*
+        FROM
+        core_introduce_letter a
+        where a.deleted=0
         <if test="coreIntroduceLetter.orgId != null ">
             and a.org_id = #{coreIntroduceLetter.orgId}
         </if>

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreOutInRecordMapper.xml

@@ -21,7 +21,9 @@
             l.reasons,
             l.type,
             l.letter_file,
-            l.letter_file as letterFileStr
+            l.letter_file as letterFileStr,
+            o.affiliated_area,
+            o.affiliated_bank
         FROM
         core_out_in_record r
         INNER JOIN sys_org o ON r.org_id=o.id

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -276,7 +276,13 @@
     </delete>
 
     <select id="pageQuestion" resultType="com.xunmei.core.question.domain.Question">
-        select * from core_question q
+        SELECT
+        q.* ,
+        o.affiliated_area,
+        o.affiliated_bank
+        FROM
+        core_question q
+        LEFT JOIN sys_org o on q.org_id = o.id
         where 1=1
         <if test="params.checkSub==true">
             and q.org_path like concat((select path from sys_org where id=#{params.orgId}),"%")
@@ -331,7 +337,13 @@
         order by q.submit_time desc,q.id desc
     </select>
     <select id="pageReform" resultType="com.xunmei.core.question.domain.Question">
-        select * from core_question q
+        SELECT
+        q.* ,
+        o.affiliated_area,
+        o.affiliated_bank
+        FROM
+        core_question q
+        LEFT JOIN sys_org o on q.org_id = o.id
 <!--        inner join sys_org o on q.org_id =o.id-->
         where q.confirm_status>=2 and q.reform_status is not null
         <if test="params.checkSub==true">
@@ -401,8 +413,11 @@
         f2.description as dissentDesc,
         f3.reform_date as reformDate,
         case q.reform_status when 10 then '未整改' when 11 then '已整改' else '' end as reformStatusText,
-        f3.description as reformDesc
+        f3.description as reformDesc,
+        o.affiliated_area,
+        o.affiliated_bank
         FROM core_question q
+        LEFT JOIN sys_org o on q.org_id = o.id
         left join core_question_flow f1 on q.id = f1.question_id and f1.execute_step = 1
         left join core_question_flow f2 on q.id = f2.question_id and f2.execute_step = 2
         left join core_question_flow f3 on q.id = f3.question_id and f3.execute_step = 11
@@ -450,8 +465,11 @@
         f2.description as dissentDesc,
         f3.reform_date as reformDate,
         case q.reform_status when 10 then '未整改' when 11 then '已整改' else '' end as reformStatusText,
-        f3.description as reformDesc
+        f3.description as reformDesc,
+        o.affiliated_area,
+        o.affiliated_bank
         FROM core_question q
+        LEFT JOIN sys_org o on q.org_id = o.id
         left join core_question_flow f1 on q.id = f1.question_id and f1.execute_step = 1
         left join core_question_flow f2 on q.id = f2.question_id and f2.execute_step = 2
         left join core_question_flow f3 on q.id = f3.question_id and f3.execute_step = 11

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionRecordMapper.xml

@@ -119,7 +119,10 @@
         r.update_by as submitter,
         r.org_id as orgId,
         r.plan_start_time as planStartTime,
-        r.plan_end_time as planEndTime
+        r.plan_end_time as planEndTime,
+        o.short_name as org_name,
+        o.affiliated_area ,
+        o.affiliated_bank
         from core_resumption r
         inner join sys_org o on r.org_id=o.id
         <where>

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -93,14 +93,19 @@
         where id = #{id}
     </select>
     <select id="selectPageList" resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo">
-        select a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join
-        sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
+        select a.*,b.role_name as roleName,c.name as retrievalUserName,
+        d.affiliated_area ,
+        d.affiliated_bank
+        from core_monitoring_retrieval_task a
+        left join sys_role b on a.role_id = b.id
+        left join sys_user c on a.retrieval_user = c.id
+        left join sys_org d on a.org_id = d.id
         where is_deleted = 0
         <if test="request.orgId != null ">
-            and a.org_id = #{request.orgId}
+            and d.id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
-            and a.org_path like concat( #{request.orgPath}, '%')
+            and d.path like concat( #{request.orgPath}, '%')
         </if>
         <if test="request.taskName != null  and request.taskName != ''">
             and a.task_name like concat('%', #{request.taskName}, '%')
@@ -199,14 +204,18 @@
     </select>
     <select id="selectAllList"
             resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskExcelVo">
-        select a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join
+        select a.*,b.role_name as roleName,c.name as retrievalUserName,
+        d.affiliated_area ,
+        d.affiliated_bank
+        from core_monitoring_retrieval_task a left join
         sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
+        left join sys_org d on a.org_id = d.id
         where is_deleted = 0
         <if test="request.orgId != null ">
-            and a.org_id = #{request.orgId}
+            and d.id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
-            and a.org_path like concat( #{request.orgPath}, '%')
+            and d.path like concat( #{request.orgPath}, '%')
         </if>
         <if test="request.taskName != null  and request.taskName != ''">
             and a.task_name like concat('%', #{request.taskName}, '%')

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -197,13 +197,14 @@
         where id = #{id}
     </select>
     <select id="selectCoreSafetyTaskPage" resultType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
-SELECT t.id,
+        SELECT
+        t.id,
         t.title,
         t.org_path,
-        o1.`short_name` as org_name,
-        o2.`short_name` as check_org_name,
-        u1.name as submit_name,
-        r1.role_name as role_name,
+        o1.`short_name` AS org_name,
+        o2.`short_name` AS check_org_name,
+        u1.NAME AS submit_name,
+        r1.role_name AS role_name,
         t.plan_id,
         t.check_org_id,
         t.start_time,
@@ -219,14 +220,18 @@ SELECT t.id,
         t.grant_user_id,
         t.source_type,
         t.role_id,
-        t.pdf_url
-        FROM core_safety_task t
+        t.pdf_url,
+        o1.affiliated_area,
+        o1.affiliated_bank
+        FROM
+        core_safety_task t
         LEFT JOIN sys_org o1 ON o1.id = t.org_id
         LEFT JOIN sys_org o2 ON o2.id = t.check_org_id
         LEFT JOIN sys_user u1 ON u1.id = t.submit_by
         LEFT JOIN sys_role r1 ON r1.id = t.role_id
-        left join core_safecheck_plan_to_role csptr on csptr.plan_id = t.plan_id
-        WHERE t.deleted = 0
+        LEFT JOIN core_safecheck_plan_to_role csptr ON csptr.plan_id = t.plan_id
+        WHERE
+        t.deleted = 0
         <if test="task.title != null  and task.title != ''">
             and t.title like concat('%', #{task.title}, '%')
         </if>
@@ -921,9 +926,12 @@ SELECT t.id,
         t.plan_start_time AS create_time,
         t.check_team,
         t.STATUS,
-        t.exception_count
+        t.exception_count,
+        o1.affiliated_area,
+        o1.affiliated_bank
         FROM
         core_safety_task t
+        LEFT JOIN sys_org o1 ON o1.id = t.org_id
         LEFT JOIN core_safecheck_plan_to_role pr ON pr.plan_id = t.plan_id
         LEFT JOIN sys_role r ON r.id = pr.role_id
         LEFT JOIN core_safecheck_plan_to_role csptr ON csptr.plan_id = t.plan_id