隐患问题整改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/controller/QuestionController.java

@@ -1,4 +1,4 @@
-package com.xunmei.system.controller;
+package com.xunmei.core.question.controller;
 
 import com.xunmei.core.question.dto.QuestionConfirmDto;
 import com.xunmei.core.question.dto.QuestionPageDto;
@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.Question;
-import com.xunmei.system.service.IQuestionService;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.service.IQuestionService;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
@@ -40,7 +40,7 @@ public class QuestionController extends BaseController {
      * 查询隐患问题清单列表
      */
     @ApiOperation(value = "查询CoreQuestion列表")
-    @RequiresPermissions("core:question:list")
+    @RequiresPermissions("question:list")
     @GetMapping("/list")
     public TableDataInfo<Question> list(QuestionPageDto query) {
         return questionService.selectPage(query);
@@ -50,52 +50,19 @@ public class QuestionController extends BaseController {
      * 获取隐患问题清单详细信息
      */
     @ApiOperation(value = "获取CoreQuestion详细信息")
-    @RequiresPermissions("core:question:query")
-    @GetMapping(value = "/{id}")
+    @RequiresPermissions("question:list:query")
+    @GetMapping(value = "/info/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(questionService.selectQuestionById(id));
     }
 
     /**
-     * 新增隐患问题清单
-     */
-    @ApiOperation(value = "新增CoreQuestion")
-    @RequiresPermissions("core:question:add")
-    @Log(title = "隐患问题清单", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody Question coreQuestion) {
-        return toAjax(questionService.insertQuestion(coreQuestion));
-    }
-
-    /**
-     * 修改隐患问题清单
-     */
-    @ApiOperation(value = "修改Question")
-    @RequiresPermissions("core:question:edit")
-    @Log(title = "隐患问题清单", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody Question coreQuestion) {
-        return toAjax(questionService.updateQuestion(coreQuestion));
-    }
-
-    /**
-     * 删除隐患问题清单
-     */
-    @ApiOperation(value = "删除Question")
-    @RequiresPermissions("core:question:remove")
-    @Log(title = "隐患问题清单", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(questionService.deleteQuestionByIds(ids));
-    }
-
-    /**
      * 确认
      *
      * @return
      */
     @PutMapping("/confirm/{id}")
-    @RequiresPermissions("core:question:confirm")
+    @RequiresPermissions("question:list:confirm")
     public AjaxResult confirm(@RequestBody QuestionConfirmDto confirmDto, @PathVariable Long id) {
         return AjaxResult.success(questionService.confirm(confirmDto));
     }
@@ -105,7 +72,7 @@ public class QuestionController extends BaseController {
      *
      * @return
      */
-    @RequiresPermissions("core:question:confirmDissent")
+    @RequiresPermissions("question:list:confirmDissent")
     @PutMapping("/confirmDissent/{id}")
     public AjaxResult confirmDissent(@RequestBody QuestionConfirmDto confirmDto, @PathVariable Long id) {
         return AjaxResult.success(questionService.confirmDissent(confirmDto));
@@ -117,7 +84,7 @@ public class QuestionController extends BaseController {
      * @param reformDto
      * @return
      */
-    @RequiresPermissions("core:question:reform")
+    @RequiresPermissions("question:list:reform")
     @PutMapping("/reform/{id}")
     public AjaxResult reform(@RequestBody QuestionReformDto reformDto, @PathVariable Long id) {
         return AjaxResult.success(questionService.reform(reformDto));

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

@@ -1,16 +1,17 @@
-package com.xunmei.system.domain;
+package com.xunmei.core.question.domain;
 
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import com.xunmei.common.core.web.domain.BaseEntity;
 
@@ -25,17 +26,22 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Accessors(chain = true)
 @TableName("core_question")
 @ApiModel(value = "CoreQuestion对象", description = "隐患问题清单")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Question extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * $column.columnComment
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 隐患所属机构
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**
@@ -52,11 +58,12 @@ public class Question extends BaseEntity {
     /**
      * 来源，1：履职，2：安全检查
      */
-    private Long srcType;
+    private Integer srcType;
 
     /**
      * 来源任务id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long srcTaskId;
 
     /**
@@ -66,11 +73,23 @@ public class Question extends BaseEntity {
     private String srcTaskName;
 
     /**
+     * 来源履职、安全检查内容id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long srcDataPointId;
+
+    /**
      * 来源检查、履职内容id
      */
     @ApiModelProperty(value = "来源检查、履职内容id")
-    private Long  SrcPointId;
-    
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long SrcPointId;
+
+    /**
+        检查、履职项名称
+     */
+    private String checkItem;
+
     /**
      * 检查内容
      */
@@ -86,6 +105,7 @@ public class Question extends BaseEntity {
     /**
      * 提出人id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long submitorId;
 
     /**
@@ -108,11 +128,16 @@ public class Question extends BaseEntity {
     private Integer confirmStatus;
 
     /**
-     * 整改状态。5未整改，6已整改
+     * 整改状态。10未整改，11已整改
      */
-    @ApiModelProperty(value = "整改状态。5未整改，6已整改")
+    @ApiModelProperty(value = "整改状态。10未整改，11已整改")
     private Integer reformStatus;
 
+    /**
+     * 整改期限
+     */
+    @ApiModelProperty(value = "整改期限")
+    private Date reformDeadline;
 
     @Override
     public String toString() {

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

@@ -1,4 +1,4 @@
-package com.xunmei.system.domain;
+package com.xunmei.core.question.domain;
 
 import java.util.Date;
 
@@ -25,7 +25,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Accessors(chain = true)
 @TableName("core_question_flow")
 @ApiModel(value = "CoreQuestionFlow对象", description = "隐患问题审批流程")
-public class QuestionFlow extends BaseEntity {
+public class QuestionFlow{
     private static final long serialVersionUID = 1L;
 
     /**
@@ -59,9 +59,15 @@ public class QuestionFlow extends BaseEntity {
     private Date executeTime;
 
     /**
-     * 流程执行状态.0未确认，1提出异议，2已确认，3已关闭,10未整改，11已整改
+     * 流程执行步骤.1确认，2异议审批,11整改
      */
-    @ApiModelProperty(value = "流程执行状态.0未确认，1提出异议，2已确认，3已关闭,10未整改，11已整改")
+    @ApiModelProperty(value = "流程执行步骤.1确认，2异议审批,11整改")
+    private Integer executeStep;
+
+    /**
+     * 流程执行结果。0：通过、1：未通过
+     */
+    @ApiModelProperty(value = "流程执行结果。0：通过、1：未通过")
     private Integer executeStatus;
 
     /**
@@ -75,6 +81,11 @@ public class QuestionFlow extends BaseEntity {
      */
     private String images;
 
+    /**
+     * 整改时间
+     */
+    private Date reformDate;
+
     @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/QuestionReformDto.java

@@ -10,9 +10,9 @@ public class QuestionReformDto {
     private Long id;
 
     /**
-     * 通过、不通过
+     * 整改时间
      */
-    private Integer status;
+    private Date reformDate;
 
     /**
      * 确认描述
@@ -20,12 +20,7 @@ public class QuestionReformDto {
     private String description;
 
     /**
-     * 整改时间
-     */
-    private Date reformDate;
-
-    /**
      * 整改图片
      */
-    private String[] images;
+    private String images;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/mapper/QuestionFlowMapper.java

@@ -1,8 +1,8 @@
-package com.xunmei.system.mapper;
+package com.xunmei.core.question.mapper;
 
 import java.util.List;
 
-import com.xunmei.system.domain.QuestionFlow;
+import com.xunmei.core.question.domain.QuestionFlow;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/mapper/QuestionMapper.java

@@ -1,8 +1,8 @@
-package com.xunmei.system.mapper;
+package com.xunmei.core.question.mapper;
 
 import java.util.List;
 
-import com.xunmei.system.domain.Question;
+import com.xunmei.core.question.domain.Question;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,4 +1,4 @@
-package com.xunmei.system.service;
+package com.xunmei.core.question.service;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import com.xunmei.core.question.dto.QuestionPageDto;
 import com.xunmei.core.question.dto.QuestionReformDto;
 import com.xunmei.core.question.vo.QuestionPageVo;
 import com.xunmei.core.question.vo.QuestionVo;
-import com.xunmei.system.domain.Question;
+import com.xunmei.core.question.domain.Question;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 

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

@@ -1,4 +1,4 @@
-package com.xunmei.system.service.impl;
+package com.xunmei.core.question.service.impl;
 
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -22,9 +22,12 @@ import com.xunmei.core.question.dto.QuestionReformDto;
 import com.xunmei.core.question.vo.QuestionFlowVo;
 import com.xunmei.core.question.QuestionSrcType;
 import com.xunmei.core.question.vo.QuestionVo;
+import com.xunmei.core.question.domain.QuestionFlow;
+import com.xunmei.core.question.mapper.QuestionFlowMapper;
+import com.xunmei.core.resumption.mapper.AppResumptionDataMapper;
+import com.xunmei.core.resumption.mapper.AppResumptionDataRemarkimgMapper;
+import com.xunmei.core.resumption.service.IAppResumptionDataRemarkimgService;
 import com.xunmei.system.api.RemoteOrgService;
-import com.xunmei.system.domain.QuestionFlow;
-import com.xunmei.system.mapper.QuestionFlowMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,9 +39,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.QuestionMapper;
-import com.xunmei.system.domain.Question;
-import com.xunmei.system.service.IQuestionService;
+import com.xunmei.core.question.mapper.QuestionMapper;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.service.IQuestionService;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -54,6 +57,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Autowired
     private RemoteOrgService orgService;
 
+    @Autowired
+    private IAppResumptionDataRemarkimgService appResumptionDataRemarkimgService;
+
     @Override
     public TableDataInfo<Question> selectPage(QuestionPageDto query) {
         //未删除
@@ -87,7 +93,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())
             );
         }
-
+        wrapper.orderByDesc(Question::getId);
         //获取数据
         page = baseMapper.selectPage(page, wrapper);
 //        Page<QuestionPageDto> r =page.
@@ -95,7 +101,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         return TableDataInfo.build(page);
     }
 
-
     /**
      * 查询隐患问题清单
      *
@@ -118,6 +123,11 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             return fvo;
         }).collect(Collectors.toList()));
 
+        if (ObjectUtil.equal(q.getSrcType(), QuestionSrcType.Resumption.getValue())) {
+            List<String> images = appResumptionDataRemarkimgService.getImagePath(q.getSrcDataPointId());
+            vo.setImages(images);
+        }
+
         return vo;
     }
 
@@ -306,7 +316,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         flow.setExecuteTime(new Date());
         flow.setExecutorId(SecurityUtils.getUserId());
         flow.setExecutorName(SecurityUtils.getLoginUser().getName());
-        flow.setImages(JSON.toJSONString(reformDto.getImages()));
+        flow.setImages(reformDto.getImages());
+        flow.setReformDate(reformDto.getReformDate());
 
         questionFlowMapper.insert(flow);
         int count = baseMapper.update(null, updateWrapper);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/vo/QuestionFlowVo.java

@@ -1,7 +1,7 @@
 package com.xunmei.core.question.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xunmei.system.domain.QuestionFlow;
+import com.xunmei.core.question.domain.QuestionFlow;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/vo/QuestionVo.java

@@ -1,14 +1,18 @@
 package com.xunmei.core.question.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xunmei.system.domain.Question;
+import com.xunmei.core.question.domain.Question;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
 
 @Data
+
 public class QuestionVo extends Question {
 //    private Long id;
 //
@@ -60,5 +64,13 @@ public class QuestionVo extends Question {
 //    @ApiModelProperty(value = "整改状态。5未整改，6已整改")
 //    private Long reformStatus;
 
+    /**
+     * 隐患图片
+     */
+    private List<String> images;
+
+    /**
+     * 确认、整改流程信息
+     */
     private List<QuestionFlowVo> flows;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/AppResumptionDataDto.java

@@ -33,6 +33,14 @@ public class AppResumptionDataDto {
      */
     private Long pointId;
     /**
+     * 履职项
+     */
+    private String itemname;
+    /**
+     * 履职内容
+     */
+    private String pointname;
+    /**
      * 任务id
      */
     private String resumptionId;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppResumptionDataRemarkimgMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.resumption.domain.AppResumptionDataRemarkimg;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 履职产生图片表(core_resumption_task_data_remarkimg)数据Mapper

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

@@ -3,14 +3,21 @@ package com.xunmei.core.resumption.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.core.resumption.domain.AppResumptionDataRemarkimg;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 履职产生图片表服务接口
  *
  * @author oygj
- * @since 2022-07-06 15:24:56
  * @description 由 Mybatisplus Code Generator 创建
+ * @since 2022-07-06 15:24:56
  */
 public interface IAppResumptionDataRemarkimgService extends IService<AppResumptionDataRemarkimg> {
-
+    /**
+     * @param dataId
+     * @return
+     */
+    List<String> getImagePath(Long dataId);
 }

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

@@ -1,11 +1,17 @@
 package com.xunmei.core.resumption.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.IDHelper;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.question.QuestionSrcType;
 import com.xunmei.core.resumption.domain.*;
 import com.xunmei.core.resumption.dto.AppResumptionDataDto;
 import com.xunmei.core.resumption.dto.resumptionRegister.ResumptionTaskDataDto;
@@ -13,13 +19,18 @@ import com.xunmei.core.resumption.dto.TaskDetailsDto;
 import com.xunmei.core.resumption.vo.*;
 import com.xunmei.core.resumption.vo.resumptionRegister.*;
 import com.xunmei.system.api.RemoteConfigService;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.model.LoginUser;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.service.IQuestionService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.rmi.ServerException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -36,17 +47,20 @@ public class ResumptionBusiness {
     private AppResumptionDataNfcService appResumptionDataNfcService;
     @Autowired
     private IAppResumptionDataRemarkimgService appResumptionTaskDataRemarkimgService;
-    @Autowired
-    private RemoteConfigService systemParameService;
+
     @Autowired
     private IAppRulePointService appRulePointService;
+
     @Autowired
     private AppResumptionDataService appResumptionDataService;
-    @Autowired
-    private IProtectionService protectionService;
+
     @Autowired
     private ICoreResumptionDataProtectionService coreResumptionDataProtectionService;
 
+    @Autowired
+    private RemoteOrgService remoteOrgService;
+    @Autowired
+    private IQuestionService questionService;
 //    public Map<String, Object> tasktotal(ResumptionTaskDto request) throws ParseException {
 //        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 //        final DateHelper dateTime = new DateHelper(sdf.parse(request.getDateTime()));
@@ -201,18 +215,18 @@ public class ResumptionBusiness {
             ResumptionTaskListVo vo = new ResumptionTaskListVo();
 
             vo.setId(map.get("id").toString());
-            SimpleDateFormat currentFormat=sdft;
+            SimpleDateFormat currentFormat = sdft;
             if (ObjectUtil.equal(type, 3)) {
-                currentFormat=sdfta;
+                currentFormat = sdfta;
                 vo.setTitle(map.get("ymd_year") + "年第" + map.get("ymd_week") + "周-" + map.get("title"));
             } else if (ObjectUtil.equal(type, 4)) {
-                currentFormat=sdfta;
+                currentFormat = sdfta;
                 vo.setTitle(map.get("ymd_year") + "年第" + map.get("ymd_month") + "月-" + map.get("title"));
             } else if (ObjectUtil.equal(type, 5)) {
-                currentFormat=sdfta;
+                currentFormat = sdfta;
                 vo.setTitle(map.get("ymd_year") + "年第" + map.get("ymd_quarter") + "季度-" + map.get("title"));
             } else if (ObjectUtil.equal(type, 6)) {
-                currentFormat=sdfta;
+                currentFormat = sdfta;
                 int ymd_halfyear = (int) map.get("ymd_halfyear");
                 String strhalfyear = "";
                 switch (ymd_halfyear) {
@@ -224,7 +238,7 @@ public class ResumptionBusiness {
                         break;
                 }
             } else if (ObjectUtil.equal(type, 7)) {
-                currentFormat=sdfta;
+                currentFormat = sdfta;
                 vo.setTitle(map.get("ymd_year") + "年-" + map.get("title"));
             }
             vo.setPlanstarttime(map.get("planstarttime") == null ? "" : currentFormat.format(LocalDateTimeToDate((LocalDateTime) map.get("planstarttime"))));
@@ -492,7 +506,7 @@ public class ResumptionBusiness {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public int submitTaskData(ResumptionTaskDataDto request, LoginUser user, Resumption resumption) throws ParseException {
+    public int submitTaskData(ResumptionTaskDataDto request, LoginUser user, Resumption resumption) throws Exception {
         int result = 0;
         Date time = new Date();
         List<AppResumptionDataNfc> nfcList = request.getNfcData();
@@ -506,6 +520,7 @@ public class ResumptionBusiness {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
         List<CoreResumptionDataProtection> resumptionProtections = new ArrayList<>();
+        SysOrg org=  remoteOrgService.selectSysOrgById(resumption.getOrgId(), SecurityConstants.INNER);
 //        List<AppResumptionTaskDataRemark> remarkDtoList = new ArrayList<>();
         for (AppResumptionDataDto appResumptionDataDto : resumptionDataList) {
             AppResumptionData data = new AppResumptionData();
@@ -560,6 +575,32 @@ public class ResumptionBusiness {
                 }).collect(Collectors.toList());
                 resumptionProtections.addAll(dataProtections);
             }
+
+            if (ObjectUtil.equal(request.getIsSubmit(), 1) && ObjectUtil.equal(appResumptionDataDto.getResValue(), 1)) {
+               if(! NumberUtil.isNumber(appResumptionDataDto.getRectificationDeadline())){
+                   throw new ServerException(String.format("履职内容‘%s’的整改期限值错误",appResumptionDataDto.getPointname()));
+               }
+
+                Question question = Question.builder()
+                        .srcTaskId(resumption.getId())
+                        .orgId(resumption.getOrgId())
+                        .orgName(org.getShortName())
+                        .orgPath(org.getPath())
+                        .SrcPointId(appResumptionDataDto.getPointId())
+                        .srcDataPointId(appResumptionDataDto.getId())
+                        .srcType(QuestionSrcType.Resumption.getValue())
+                        .srcTaskName(resumption.getName())
+                        .checkItem(appResumptionDataDto.getItemname())
+                        .checkContent(appResumptionDataDto.getPointname())
+                        .questionDesc(appResumptionDataDto.getResRemark())
+                        .submitorId(ObjectUtil.isNull(appResumptionDataDto.getSubmitBy()) ? user.getUserid() : appResumptionDataDto.getSubmitBy())
+                        .submitorName(ObjectUtil.isNull(appResumptionDataDto.getSubmitName()) ? user.getName() : appResumptionDataDto.getSubmitName())
+                        .submitTime(ObjectUtil.isNull(appResumptionDataDto.getSubmitTime()) ? new Date() : appResumptionDataDto.getSubmitTime())
+                        .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(appResumptionDataDto.getRectificationDeadline()))))
+                        .build();
+
+                questionService.insertQuestion(question);
+            }
         }
         appResumptionDataService.saveBatch(list);
         //获取未提交的履职数据当未提交的履职数据为0时，修改履职任务为已完成
@@ -597,6 +638,8 @@ public class ResumptionBusiness {
 
         //清除代办
 //        this.todoService.remove(resumption.getId());
+
+
         return result;
     }
 }

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

@@ -1,13 +1,18 @@
 package com.xunmei.core.resumption.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.core.resumption.mapper.AppResumptionDataRemarkimgMapper;
 import com.xunmei.core.resumption.service.IAppResumptionDataRemarkimgService;
 import com.xunmei.core.resumption.domain.AppResumptionDataRemarkimg;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 履职产生图片表服务接口实现
  *
@@ -19,5 +24,17 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 @Service
 public class AppResumptionDataRemarkimgServiceImpl extends ServiceImpl<AppResumptionDataRemarkimgMapper, AppResumptionDataRemarkimg> implements IAppResumptionDataRemarkimgService {
+    /**
+     *
+     * @param dataId
+     * @return
+     */
+    @Override
+    public List<String> getImagePath(Long dataId){
+       List<AppResumptionDataRemarkimg> list= baseMapper.selectList(new LambdaQueryWrapper<AppResumptionDataRemarkimg>()
+                .eq(AppResumptionDataRemarkimg::getResumptionDataId,dataId)
+                 .select(AppResumptionDataRemarkimg::getImgPath));
 
+       return  list.stream().map(i->i.getImgPath()).collect(Collectors.toList());
+    }
 }

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.QuestionFlowMapper">
+<mapper namespace="com.xunmei.core.question.mapper.QuestionFlowMapper">
 
-    <resultMap type="com.xunmei.system.domain.QuestionFlow" id="CoreQuestionFlowResult">
+    <resultMap type="com.xunmei.core.question.domain.QuestionFlow" id="CoreQuestionFlowResult">
                 <result property="id" column="id"/>
                 <result property="questionId" column="question_id"/>
                 <result property="executorId" column="executor_id"/>
@@ -19,7 +19,7 @@
         from core_question_flow
     </sql>
 
-    <select id="selectCoreQuestionFlowList" parameterType="com.xunmei.system.domain.QuestionFlow"
+    <select id="selectCoreQuestionFlowList" parameterType="com.xunmei.core.question.domain.QuestionFlow"
             resultMap="CoreQuestionFlowResult">
         <include refid="selectCoreQuestionFlowVo"/>
         <where>
@@ -50,7 +50,7 @@
             where id = #{id}
     </select>
 
-    <insert id="insertCoreQuestionFlow" parameterType="com.xunmei.system.domain.QuestionFlow">
+    <insert id="insertCoreQuestionFlow" parameterType="com.xunmei.core.question.domain.QuestionFlow">
         insert into core_question_flow
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -86,7 +86,7 @@
         </trim>
     </insert>
 
-    <update id="updateCoreQuestionFlow" parameterType="com.xunmei.system.domain.QuestionFlow">
+    <update id="updateCoreQuestionFlow" parameterType="com.xunmei.core.question.domain.QuestionFlow">
         update core_question_flow
         <trim prefix="SET" suffixOverrides=",">
                     <if test="questionId != null">question_id =

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.QuestionMapper">
+<mapper namespace="com.xunmei.core.question.mapper.QuestionMapper">
 
-    <resultMap type="com.xunmei.system.domain.Question" id="CoreQuestionResult">
+    <resultMap type="com.xunmei.core.question.domain.Question" id="CoreQuestionResult">
                 <result property="id" column="id"/>
                 <result property="orgId" column="org_id"/>
                 <result property="orgName" column="org_name"/>
@@ -30,7 +30,7 @@
         from core_question
     </sql>
 
-    <select id="selectCoreQuestionList" parameterType="com.xunmei.system.domain.Question"
+    <select id="selectCoreQuestionList" parameterType="com.xunmei.core.question.domain.Question"
             resultMap="CoreQuestionResult">
         <include refid="selectCoreQuestionVo"/>
         <where>
@@ -55,7 +55,7 @@
             where id = #{id}
     </select>
 
-    <insert id="insertCoreQuestion" parameterType="com.xunmei.system.domain.Question">
+    <insert id="insertCoreQuestion" parameterType="com.xunmei.core.question.domain.Question">
         insert into core_question
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -135,7 +135,7 @@
         </trim>
     </insert>
 
-    <update id="updateCoreQuestion" parameterType="com.xunmei.system.domain.Question">
+    <update id="updateCoreQuestion" parameterType="com.xunmei.core.question.domain.Question">
         update core_question
         <trim prefix="SET" suffixOverrides=",">
                     <if test="orgId != null">org_id =

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

@@ -8,5 +8,4 @@
     <sql id="baseColumn">
         id,task_id,task_data_id,remark_id,img_path
     </sql>
-
 </mapper>