Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -894,6 +894,17 @@ IF
 END ?? 
 DELIMITER;
 CALL schema_change ();
+
+ALTER TABLE `core_resumption_rule_item` 
+MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '履职项名称' AFTER `rule_id`;
+
+ALTER TABLE `core_resumption_rule_point` 
+MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '履职要点名称' AFTER `item_id`;
+
+ALTER TABLE `core_safetycheck_rule_item` 
+MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查项名称' AFTER `rule_id`;
+ALTER TABLE `core_safetycheck_rule_point` 
+MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查内容' AFTER `item_id`;
 -- -------------------------------------------------------
 -- ----------修改表脚本 end ----------------------------
 -- -------------------------------------------------------

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/controller/GxResumptionController.java

@@ -5,6 +5,9 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.core.resumption.gx.service.ResumptionService;
 import com.xunmei.core.resumption.gx.vo.ResumptionTaskDetailVo;
+import com.xunmei.system.api.factory.RemoteJobFallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +22,8 @@ import java.time.Duration;
 @RequestMapping("gx/resumption")
 public class GxResumptionController {
 
+    private static final Logger log = LoggerFactory.getLogger(GxResumptionController.class);
+
     @Autowired
     private ResumptionService resumptionService;
 
@@ -58,6 +63,7 @@ public class GxResumptionController {
             return AjaxResult.success();
         } catch (Exception e) {
             e.printStackTrace();
+            log.error("数据处理出错",e);
             RedisUtils.deleteObject("resumption" + taskDetailVo.getTaskId());
             return AjaxResult.error(e.getMessage());
         }

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

@@ -1,12 +1,20 @@
 package com.xunmei.core.resumption.gx.service;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.question.QuestionSrcType;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.service.IQuestionService;
 import com.xunmei.core.resumption.domain.*;
 import com.xunmei.core.resumption.gx.vo.*;
 import com.xunmei.core.resumption.mapper.*;
 import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +39,12 @@ public class ResumptionServiceImpl implements ResumptionService{
     @Autowired
     private AppResumptionDataNfcMapper appResumptionDataNfcMapper;
 
+    @Autowired
+    private RemoteOrgService remoteOrgService;
+
+    @Autowired
+    private IQuestionService questionService;
+
     @Override
     public Map<String, List<ResumptionTaskListVo>> getTaskList(ResumptionTaskNewDto dto) {
 
@@ -105,6 +119,8 @@ public class ResumptionServiceImpl implements ResumptionService{
         int quarter =dateTime.getQuarter() ;
         //获取履职任务
         Resumption sysResumption = resumptionMapper.findOneByTaskIdAndDate(taskId,year,quarter);
+        Long orgId = sysResumption.getOrgId();
+
         sysResumption.setUpdateBy(SecurityUtils.getUsername());
         sysResumption.setUpdateTime(new Date());
         sysResumption.setSubmitTime(new Date());
@@ -153,6 +169,29 @@ public class ResumptionServiceImpl implements ResumptionService{
                 }
                  appResumptionDataMapper.insert(data);
 
+                if(taskDetailVo.getSubType() == 2 && ObjectUtil.equal(point.getResValue(),1) ){
+                    SysOrg org = remoteOrgService.selectSysOrgById(sysResumption.getOrgId(), SecurityConstants.INNER);
+                    Question question = Question.builder()
+                            .srcTaskId(taskId)
+                            .orgId(org.getId())
+                            .orgName(org.getShortName())
+                            .orgPath(org.getPath())
+                            .SrcPointId(point.getPointId())
+                            .srcDataPointId(data.getId())
+                            .srcType(QuestionSrcType.Resumption.getValue())
+                            .srcTaskName(sysResumption.getName())
+                            .checkItem(check.getItemName())
+                            .checkContent(point.getPointName())
+                            .questionDesc(data.getResRemark())
+                            .submitorId(ObjectUtil.isNull(data.getSubmitBy()) ? SecurityUtils.getLoginUser().getUserid() : data.getSubmitBy())
+                            .submitorName(ObjectUtil.isNull(data.getSubmitName()) ? SecurityUtils.getLoginUser().getName() : data.getSubmitName())
+                            .submitTime(ObjectUtil.isNull(data.getSubmitTime()) ? new Date() : data.getSubmitTime())
+                            .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
+                            .build();
+
+                    questionService.insertQuestion(question);
+                }
+
                 List<AppResumptionDataRemarkimg> imgs = point.getImgs();
                 for (AppResumptionDataRemarkimg img : imgs) {
                     img.setResumptionDataId(data.getId());

soc-modules/soc-modules-core/src/main/resources/mapper/access/CoreMonitoringTaskRegistrationMonitorMapper.xml

@@ -68,7 +68,7 @@
         SELECT cmtrm.id            AS id,
                cmtrm.`host`        AS `host`,
                cmtrm.video_channel AS videoChannel,
-               CONCAT('通道', sd.channel  )	AS videoChannelName,
+        sd.device_name	AS videoChannelName,
                sd1.device_name     AS hostName
         FROM core_monitoring_task_registration_monitor cmtrm
                  LEFT JOIN sys_device sd ON sd.id = cmtrm.video_channel