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

project_data/sql/0.0.5/soc/soc.sql

@@ -339,4 +339,77 @@ INSERT INTO `sys_org_map` VALUES ('M43000000', '/map/zhangzhou.json', NULL, NULL
 INSERT INTO `sys_org_map` VALUES ('M44000000', '/map/longyan.json', NULL, NULL, '龙岩地区行社');
 INSERT INTO `sys_org_map` VALUES ('M45000000', '/map/sanming.json', NULL, NULL, '三明地区行社');
 INSERT INTO `sys_org_map` VALUES ('M46000000', '/map/nanping.json', NULL, NULL, '南平地区行社');
-INSERT INTO `sys_org_map` VALUES ('M47000000', '/map/ningde.json', NULL, NULL, '宁德地区行社');
+INSERT INTO `sys_org_map` VALUES ('M47000000', '/map/ningde.json', NULL, NULL, '宁德地区行社');
+
+update sys_org set sort =6000 WHERE short_name='福州农商行';
+update sys_org set sort =6001 WHERE short_name='闽侯联社';
+update sys_org set sort =6002 WHERE short_name='闽清联社';
+update sys_org set sort =6003 WHERE short_name='永泰联社';
+update sys_org set sort =6004 WHERE short_name='长乐农商银行';
+update sys_org set sort =6005 WHERE short_name='福清汇通农商行';
+update sys_org set sort =6006 WHERE short_name='平潭农商银行';
+update sys_org set sort =6007 WHERE short_name='连江农商行';
+update sys_org set sort =6008 WHERE short_name='罗源联社';
+update sys_org set sort =6009 WHERE short_name='厦门农商银行';
+update sys_org set sort =6010 WHERE short_name='漳州农商银行';
+update sys_org set sort =6011 WHERE short_name='龙海农商银行';
+
+update sys_org set sort =6012 WHERE short_name='云霄联社';
+update sys_org set sort =6013 WHERE short_name='漳浦农商银行';
+update sys_org set sort =6014 WHERE short_name='诏安联社';
+update sys_org set sort =6015 WHERE short_name='长泰联社';
+update sys_org set sort =6016 WHERE short_name='东山联社';
+update sys_org set sort =6017 WHERE short_name='南靖联社';
+update sys_org set sort =6018 WHERE short_name='平和联社';
+update sys_org set sort =6019 WHERE short_name='华安联社';
+update sys_org set sort =6020 WHERE short_name='泉州农商银行';
+update sys_org set sort =6021 WHERE short_name='晋江农商银行';
+update sys_org set sort =6022 WHERE short_name='石狮农商银行';
+update sys_org set sort =6023 WHERE short_name='南安农商银行';
+
+update sys_org set sort =6024 WHERE short_name='惠安联社';
+update sys_org set sort =6025 WHERE short_name='安溪农商银行';
+update sys_org set sort =6026 WHERE short_name='永春联社';
+update sys_org set sort =6027 WHERE short_name='德化联社';
+update sys_org set sort =6028 WHERE short_name='莆田农商银行';
+update sys_org set sort =6029 WHERE short_name='仙游农商银行';
+update sys_org set sort =6030 WHERE short_name='三明农商银行';
+update sys_org set sort =6031 WHERE short_name='明溪联社';
+update sys_org set sort =6032 WHERE short_name='永安农商银行';
+update sys_org set sort =6033 WHERE short_name='清流联社';
+update sys_org set sort =6034 WHERE short_name='宁化联社';
+update sys_org set sort =6035 WHERE short_name='大田联社';
+
+update sys_org set sort =6036 WHERE short_name='尤溪联社';
+update sys_org set sort =6037 WHERE short_name='沙县农商行';
+update sys_org set sort =6038 WHERE short_name='将乐联社';
+update sys_org set sort =6039 WHERE short_name='泰宁县联社';
+update sys_org set sort =6040 WHERE short_name='建宁联社';
+update sys_org set sort =6041 WHERE short_name='南平农商银行';
+update sys_org set sort =6042 WHERE short_name='邵武农商银行';
+update sys_org set sort =6043 WHERE short_name='建阳联社';
+update sys_org set sort =6044 WHERE short_name='武夷山农商银行';
+update sys_org set sort =6045 WHERE short_name='建瓯农商银行';
+update sys_org set sort =6046 WHERE short_name='顺昌联社';
+update sys_org set sort =6047 WHERE short_name='浦城联社';
+
+update sys_org set sort =6048 WHERE short_name='光泽联社';
+update sys_org set sort =6049 WHERE short_name='松溪联社';
+update sys_org set sort =6050 WHERE short_name='政和联社';
+update sys_org set sort =6051 WHERE short_name='龙岩农商银行';
+update sys_org set sort =6052 WHERE short_name='长汀联社';
+update sys_org set sort =6053 WHERE short_name='永定联社';
+update sys_org set sort =6054 WHERE short_name='上杭农商银行';
+update sys_org set sort =6055 WHERE short_name='武平联社';
+update sys_org set sort =6056 WHERE short_name='漳平农商银行';
+update sys_org set sort =6057 WHERE short_name='连城联社';
+update sys_org set sort =6058 WHERE short_name='宁德农商银行';
+update sys_org set sort =6059 WHERE short_name='福鼎联社';
+
+update sys_org set sort =6060 WHERE short_name='霞浦联社';
+update sys_org set sort =6061 WHERE short_name='福安联社';
+update sys_org set sort =6062 WHERE short_name='古田联社';
+update sys_org set sort =6063 WHERE short_name='屏南联社';
+update sys_org set sort =6064 WHERE short_name='寿宁联社';
+update sys_org set sort =6065 WHERE short_name='周宁联社';
+update sys_org set sort =6066 WHERE short_name='柘荣联社';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -925,7 +925,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         AccessPdf accessPdf = buildSafetyCheckRegisterBookData(accessPdfVO);
         String url = this.createAccessPdfNow(accessPdf);
         CoreRegisterBookPdf registerBookPdf = new CoreRegisterBookPdf();
-        //  registerBookPdf.setId(appSafetyCheckTask.getId());
         registerBookPdf.setRegisterBookType(RegisterBookType.MONITOR_ACCESS.getNum());
         registerBookPdf.setDate(new Date());
         registerBookPdf.setId(accessPdfVO.getTaskId());
@@ -933,7 +932,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         registerBookPdf.setOrgId(org.getId());
         registerBookPdf.setOrgPath(org.getPath());
         registerBookPdf.setFileUrl(url);
-        //registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "\\"));
         registerBookPdf.setFileName(StringUtils.substringAfterLast(url, File.separator));
         registerBookPdf.setOrgName(accessPdf.getOrgName());
         if (StringUtils.isEmpty(url) || StringUtils.isEmpty(registerBookPdf.getFileName())) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -59,10 +59,11 @@ public class CoreEvaluateTaskController extends BaseController {
     private static String FORMAT_SECOND = "yyyy-MM-dd HH:mm:ss";
     private static String FORMAT_MILLISECOND = "yyyy-MM-dd HH:mm:ss.SSS";
     private static String FORMAT_FIRST = "-01 00:00:00";
-    private static String FORMAT_DAY="yyyy-MM-dd";
-    private static String FORMAT_LAST=  " 23:59:59";
-    private static String FORMAT_DAY_FIRST="-01-01 00:00:00";
-    private static String FORMAT_DAY_LAST="-12-31 23:59:59";
+    private static String FORMAT_DAY = "yyyy-MM-dd";
+    private static String FORMAT_LAST = " 23:59:59";
+    private static String FORMAT_DAY_FIRST = "-01-01 00:00:00";
+    private static String FORMAT_DAY_LAST = "-12-31 23:59:59";
+
     /**
      * 查询外包评价任务列表
      */
@@ -123,7 +124,6 @@ public class CoreEvaluateTaskController extends BaseController {
         AjaxResult ajaxResult = AjaxResult.success();
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         ajaxResult.put("orgName", sysOrg.getShortName());
-
         if (null != evaluateTaskStatisticsDTO.getPlanId()) {
             CoreEvaluatePlanVO coreEvaluatePlanVO = coreEvaluatePlanService.selectCoreEvaluatePlanById(evaluateTaskStatisticsDTO.getPlanId());
             LocalDate localDate = LocalDate.now();
@@ -139,6 +139,9 @@ public class CoreEvaluateTaskController extends BaseController {
                             evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + FORMAT_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             year = String.valueOf(localDate.getYear());
                             month = String.valueOf(localDate.getMonthValue());
+                            if (month.length() == 1) {
+                                month = "0" + localDate.getMonthValue();
+                            }
                         } else {
                             evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + FORMAT_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             String[] split = evaluateTaskStatisticsDTO.getSearchTime().split("-");

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/controller/ResumptionReportController.java

@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -57,6 +58,7 @@ public class ResumptionReportController {
         }
         resumptionReportService.export(request, response);
     }
+
     @ApiOperation(value = "每日安全保卫履职-日报表")
     @RequiresPermissions("core:resumptionReport:list")
     @GetMapping("/list")
@@ -66,7 +68,11 @@ public class ResumptionReportController {
             if (null == resumptionDTO.getCycle() || resumptionDTO.getCycle() == 1) {
                 resumptionDTO.setSearchTime(currentDate.toString());
             } else {
-                resumptionDTO.setSearchTime(currentDate.getYear() + "-" + currentDate.getMonthValue());
+                String m = String.valueOf(currentDate.getMonthValue());
+                if (m.length() == 1) {
+                    m = "0" + currentDate.getMonthValue();
+                }
+                resumptionDTO.setSearchTime(currentDate.getYear() + "-" + m);
             }
         }
         AjaxResult ajaxResult = AjaxResult.success();
@@ -81,6 +87,7 @@ public class ResumptionReportController {
         ajaxResult.put("orgName", sysOrg.getShortName());
         return ajaxResult;
     }
+
     @ApiOperation(value = "报警测试报表导出")
     @RequiresPermissions("core:resumptionReport:export")
     @PostMapping("/intrusionTestExport")
@@ -91,13 +98,18 @@ public class ResumptionReportController {
         }
         resumptionReportService.intrusionTestExport(request, response);
     }
+
     @ApiOperation(value = "报警测试报表")
     @RequiresPermissions("core:resumptionReport:list")
     @GetMapping("/intrusionTest")
     public AjaxResult intrusionTest(ResumptionDTO resumptionDTO) {
         if (null == resumptionDTO.getSearchTime()) {
             LocalDate currentDate = LocalDate.now();
-            resumptionDTO.setSearchTime(currentDate.getYear() + "-" + currentDate.getMonthValue());
+            String m = String.valueOf(currentDate.getMonthValue());
+            if (m.length() == 1) {
+                m = "0" + currentDate.getMonthValue();
+            }
+            resumptionDTO.setSearchTime(currentDate.getYear() + "-" + m);
         }
         AjaxResult ajaxResult = AjaxResult.success();
         List<IntrusionTestReportVO> intrusionTestReportVOList = resumptionReportService.intrusionTest(resumptionDTO);
@@ -107,6 +119,7 @@ public class ResumptionReportController {
         ajaxResult.put("orgName", sysOrg.getShortName());
         return ajaxResult;
     }
+
     @ApiOperation(value = "备用电源报表导出")
     @RequiresPermissions("core:resumptionReport:export")
     @PostMapping("/standbyPowerExport")
@@ -119,6 +132,7 @@ public class ResumptionReportController {
         }
         resumptionReportService.standbyPowerExport(request, response);
     }
+
     @ApiOperation(value = "备用电源维护报表")
     @RequiresPermissions("core:resumptionReport:list")
     @GetMapping("/standbyPower")
@@ -146,6 +160,7 @@ public class ResumptionReportController {
         ajaxResult.put("orgName", sysOrg.getShortName());
         return ajaxResult;
     }
+
     @ApiOperation(value = "离行式自助银行巡检报表导出")
     @RequiresPermissions("core:resumptionReport:export")
     @PostMapping("/serviceBankExport")
@@ -156,13 +171,18 @@ public class ResumptionReportController {
         }
         resumptionReportService.serviceBankExport(request, response);
     }
+
     @ApiOperation(value = "离行式自助银行巡检报表")
     @RequiresPermissions("core:resumptionReport:list")
     @GetMapping("/serviceBank")
     public AjaxResult serviceBank(ResumptionDTO resumptionDTO) {
         if (null == resumptionDTO.getSearchTime()) {
             LocalDate currentDate = LocalDate.now();
-            resumptionDTO.setSearchTime(currentDate.getYear() + "-" + currentDate.getMonthValue());
+            String m = String.valueOf(currentDate.getMonthValue());
+            if (m.length() == 1) {
+                m = "0" + currentDate.getMonthValue();
+            }
+            resumptionDTO.setSearchTime(currentDate.getYear() + "-" + m);
         }
         AjaxResult ajaxResult = AjaxResult.success();
         List<IntrusionTestReportVO> intrusionTestReportVOList = resumptionReportService.serviceBank(resumptionDTO);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/controller/SafetyInspectReportController.java

@@ -40,8 +40,8 @@ public class SafetyInspectReportController {
     @RequiresPermissions("core:safetyInspectReport:list")
     @GetMapping("/list")
     public AjaxResult list(SafetyInspectDTO safetyInspectDTO) {
-        if (null==safetyInspectDTO.getYear()){
-            LocalDate localDate= LocalDate.now();
+        if (null == safetyInspectDTO.getYear()) {
+            LocalDate localDate = LocalDate.now();
             safetyInspectDTO.setYear(String.valueOf(localDate.getYear()));
         }
         AjaxResult ajax = AjaxResult.success();
@@ -52,7 +52,7 @@ public class SafetyInspectReportController {
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(safetyInspectDTO.getOrgId(), SecurityConstants.INNER);
         ajax.put("orgName", sysOrg.getShortName());
-        ajax.put("title","行社全面检查统计报表("+safetyInspectDTO.getYear()+")");
+        ajax.put("title", "行社全面检查统计报表(" + safetyInspectDTO.getYear() + ")");
         return ajax;
     }
 
@@ -61,16 +61,20 @@ public class SafetyInspectReportController {
     @GetMapping("/selfInspectList")
     public AjaxResult selfInspectList(SafetyInspectDTO safetyInspectDTO) {
         AjaxResult ajax = AjaxResult.success();
-     if (null== safetyInspectDTO.getYear()){
-         if (safetyInspectDTO==null||safetyInspectDTO.getCycle()==1){
-             safetyInspectDTO.setCycle(1);
-             LocalDate localDate= LocalDate.now();
-             safetyInspectDTO.setYear(localDate.getYear()+"-"+  localDate.getMonthValue());
-         }else {
-             LocalDate localDate= LocalDate.now();
-             safetyInspectDTO.setYear(localDate.getYear()+"");
-         }
-     }
+        if (null == safetyInspectDTO.getYear()) {
+            if (safetyInspectDTO == null || safetyInspectDTO.getCycle() == 1) {
+                safetyInspectDTO.setCycle(1);
+                LocalDate localDate = LocalDate.now();
+                String m = String.valueOf(localDate.getMonthValue());
+                if (m.length() == 1) {
+                    m = "0" + localDate.getMonthValue();
+                }
+                safetyInspectDTO.setYear(localDate.getYear() + "-" + m);
+            } else {
+                LocalDate localDate = LocalDate.now();
+                safetyInspectDTO.setYear(localDate.getYear() + "");
+            }
+        }
         List<SelfInspectVO> report = safetyInspectService.selfInspectReport(safetyInspectDTO);
         ajax.put(AjaxResult.DATA_TAG, report);
         if (null == safetyInspectDTO.getOrgId()) {
@@ -78,9 +82,10 @@ public class SafetyInspectReportController {
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(safetyInspectDTO.getOrgId(), SecurityConstants.INNER);
         ajax.put("orgName", sysOrg.getShortName());
-        ajax.put("title","网点负责人自查报表("+safetyInspectDTO.getYear()+")");
+        ajax.put("title", "网点负责人自查报表(" + safetyInspectDTO.getYear() + ")");
         return ajax;
     }
+
     @GetMapping("/selectAllOrg")
     public AjaxResult selectAllOrg() {
         return AjaxResult.success(safetyInspectService.selectAllOrg());
@@ -94,21 +99,22 @@ public class SafetyInspectReportController {
     @Log(title = "行社全面检查报表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SafetyInspectDTO request, HttpServletResponse response) throws IOException {
-        if (null==request.getYear()){
-            LocalDate localDate= LocalDate.now();
+        if (null == request.getYear()) {
+            LocalDate localDate = LocalDate.now();
             request.setYear(String.valueOf(localDate.getYear()));
         }
         safetyInspectService.export(request, response);
     }
+
     @ApiOperation(value = "网点负责人自查报表导出")
     @RequiresPermissions("core:safetyInspectReport:export")
     @Log(title = "网点负责人自查报表导出", businessType = BusinessType.EXPORT)
     @PostMapping("/selfInspectExport")
     public void selfInspectExport(SafetyInspectDTO request, HttpServletResponse response) throws IOException {
-        if (null== request.getYear()){
+        if (null == request.getYear()) {
             request.setCycle(1);
-            LocalDate localDate= LocalDate.now();
-            request.setYear(localDate.getYear()+"-"+  localDate.getMonthValue());
+            LocalDate localDate = LocalDate.now();
+            request.setYear(localDate.getYear() + "-" + localDate.getMonthValue());
         }
         safetyInspectService.selfInspectExport(request, response);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -182,6 +182,7 @@ public class ResumptionServiceImpl implements ResumptionService {
                         throw new ServiceException("整改期限为空或不是有效的数值");
                     }
                     SysOrg org = remoteOrgService.selectSysOrgById(sysResumption.getOrgId(), SecurityConstants.INNER);
+
                     Question question = Question.builder()
                             .srcTaskId(taskId)
                             .orgId(org.getId())
@@ -190,7 +191,6 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .SrcPointId(point.getPointId())
                             .srcDataPointId(pointId)
                             .srcType(QuestionSrcType.Resumption.getValue())
-                            .srcTaskType(appPlan.getPlanType())
                             .srcTaskName(sysResumption.getName())
                             .checkItem(check.getItemName())
                             .checkContent(point.getPointName())
@@ -200,6 +200,9 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .submitTime(ObjectUtil.isNull(data.getSubmitTime()) ? new Date() : data.getSubmitTime())
                             .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
                             .build();
+                    if(appPlan != null){
+                        question.setSrcTaskType(appPlan.getPlanType());
+                    }
                     IdWorker.getId(question);
                     if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
                         question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());