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

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

@@ -3,6 +3,7 @@ package com.xunmei.core.question.domain;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -37,6 +38,7 @@ public class Question extends BaseEntity {
      * $column.columnComment
      */
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId
     private Long id;
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/IQuestionService.java

@@ -37,6 +37,8 @@ public interface IQuestionService extends IService<Question> {
      */
     int insertQuestion(Question question);
 
+    Question handleQuestion(Question question);
+
     /**
      * 查询隐患问题清单分页数据
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -41,6 +41,7 @@ import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataRemarkimg;
 import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataRemarkimgService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,6 +62,7 @@ import java.util.stream.Collectors;
  * @date 2023-09-12
  */
 @Service
+@Slf4j
 public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements IQuestionService {
     @Autowired
     private QuestionFlowMapper questionFlowMapper;
@@ -192,8 +194,21 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Override
     @Transactional
     public int insertQuestion(Question question) {
-        question.setId(IDHelper.id());
+//        question.setId(IDHelper.id());
 
+//        if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
+//            question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
+//            question.setReformStatus(QuestionReformEnum.Unreform.getValue());
+//        } else {
+//            question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
+//            question.setReformStatus(null);
+//        }
+        question = handleQuestion(question);
+        return baseMapper.insert(question);
+    }
+
+    @Override
+    public Question handleQuestion(Question question) {
         if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
             question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
             question.setReformStatus(QuestionReformEnum.Unreform.getValue());
@@ -202,10 +217,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             question.setReformStatus(null);
         }
 
-        return baseMapper.insert(question);
+        return question;
     }
 
-
     /**
      * 确认
      *

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

@@ -155,7 +155,6 @@ public class ResumptionServiceImpl implements ResumptionService {
         resumptionDelService.delResumptionData(taskId);
 
 
-
         //保存新的数据
         AppResumptionData data = null;
         List<ResumptionItemVo> checks = taskDetailVo.getChecks();
@@ -216,15 +215,15 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
                             .build();
                     IdWorker.getId(question);
-                    if (ObjectUtil.equal(question.getOrgId(),SecurityUtils.getLoginUser().getOrgId())) {
+                    if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
                         question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
                         question.setReformStatus(QuestionReformEnum.Unreform.getValue());
                     } else {
                         question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
                         question.setReformStatus(null);
                     }
-                    questions.add(question);
-                    questionService.insertQuestion(question);
+                    questions.add(questionService.handleQuestion(question));
+//                    questionService.insertQuestion(question);
                 }
 
                 if (ObjectUtil.equal(point.getResValue(), 1)) {
@@ -267,23 +266,22 @@ public class ResumptionServiceImpl implements ResumptionService {
          */
 
         //1.批量插入 履职数据。
-        if(ards.size() > 0){
+        if (ards.size() > 0) {
             resumptionMapper.batchInsertResumptionData(ards);
         }
         //2.批量插入 问题数据。
-        if(questions.size() > 0){
+        if (questions.size() > 0) {
             resumptionMapper.batchInsertResumptionQuestion(questions);
         }
         //3.批量插入 图片数据。
-        if(adImgs.size() > 0){
+        if (adImgs.size() > 0) {
             resumptionMapper.batchInsertResumptionImg(adImgs);
         }
         //3.批量插入 扫描数据。
-        if(dataNfcs.size() > 0){
+        if (dataNfcs.size() > 0) {
             resumptionMapper.batchInsertResumptionNfc(dataNfcs);
         }
 
-
         resumptionMapper.updateById(sysResumption);
         if (ObjectUtil.equal(taskDetailVo.getSubType(), 2)) {
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {

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

@@ -472,6 +472,19 @@
 
     </insert>
     <insert id="batchInsertResumptionImg" parameterType="java.util.List">
+        INSERT INTO core_resumption_data_remarkimg
+        (`id`, `resumption_id`, `resumption_data_id`, `img_path`)
+        VALUES
+        <foreach collection="list" item="item" index="index"  separator="," >
+            (
+            #{item.id},
+            #{item.resumptionId},
+            #{item.resumptionDataId},
+            #{item.imgPath}
+            )
+        </foreach>
+    </insert>
+    <insert id="batchInsertResumptionNfc" parameterType="java.util.List">
         INSERT INTO core_resumption_data_nfc
         ( `id`, `resumption_id`, `nfc_id`, `submit_time`, `submit_by`, `status`, `scan_method`, `img`, `point_id` )
         VALUES
@@ -489,9 +502,6 @@
             )
         </foreach>
     </insert>
-    <insert id="batchInsertResumptionNfc" parameterType="java.util.List">
-
-    </insert>
     <update id="updatePlanId">
         update core_resumption set parent_plan_id=#{newPlanParentId},plan_id=#{newPlanId} where plan_id=#{oldPlanId} and (status=0 or status=1)
     </update>