临时登记

project_data/sql/0.0.3/soc/soc.sql

@@ -581,6 +581,7 @@ INSERT INTO `sys_role` VALUES (114, '1', '省联社部门管理层', 'default',
 DELETE from `sys_menu` WHERE `id`=01720394197110317057;
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01720394197110317057, '驾驶舱', 0, 1, 'board', 'board/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'chart', NULL, '超级管理员', '2023-11-03 18:55:39', '超级管理员', '2023-11-03 18:56:17', '');
 
+
 DELETE from `sys_role_menu` WHERE `menu_id`=1720394197110317057;
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 1720394197110317057);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1720394197110317057);

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

@@ -90,19 +90,19 @@ public class QuestionController extends BaseController {
     public AjaxResult confirmDissent(@RequestBody QuestionConfirmDto confirmDto, @PathVariable Long id) {
         return AjaxResult.success(questionService.confirmDissent(confirmDto));
     }
-
-    /**
-     * 整改
-     *
-     * @param reformDto
-     * @return
-     */
-    @ApiOperation(value = "整改")
-    @RequiresPermissions("question:list:reform")
-    @PutMapping("/reform/{id}")
-    public AjaxResult reform(@RequestBody QuestionReformDto reformDto, @PathVariable Long id) {
-        return AjaxResult.success(questionReformService.reform(reformDto));
-    }
+//
+//    /**
+//     * 整改
+//     *
+//     * @param reformDto
+//     * @return
+//     */
+//    @ApiOperation(value = "整改")
+//    @RequiresPermissions("question:list:reform")
+//    @PutMapping("/reform/{id}")
+//    public AjaxResult reform(@RequestBody QuestionReformDto reformDto, @PathVariable Long id) {
+//        return AjaxResult.success(questionReformService.reform(reformDto));
+//    }
 
     @ApiOperation(value = "隐患问题导出")
     @PostMapping("/export")

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

@@ -24,6 +24,6 @@ public class QuestionPageDto extends PageDto<QuestionPageVo> {
     @ApiModelProperty(value = "提交日期范围")
     private Date[] submitRange;
 
-    @ApiModelProperty(value = "整改日期")
-    private Date submitTime;
+//    @ApiModelProperty(value = "整改日期")
+//    private Date submitTime;
 }

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

@@ -17,4 +17,7 @@ public class ReformPageDto extends PageDto<QuestionPageVo> {
 
     @ApiModelProperty(value = "整改日期范围")
     private Date[] reformRange;
+
+    @ApiModelProperty(value = "整改日期")
+    private Date reformDate;
 }

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

@@ -92,6 +92,13 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
             wrapper.between(Question::getReformDeadline, start, end);
         }
 
+        if (ObjectUtil.isNotNull(query.getReformDate())) {
+            Date start = DateUtil.beginOfDay(query.getReformDate());
+            wrapper.ge(Question::getReformDeadline, start);
+
+            Date end = DateUtil.endOfDay(query.getReformDate());
+            wrapper.le(Question::getReformDeadline, end);
+        }
         if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
             wrapper.and(w ->
                     w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())

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

@@ -89,13 +89,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             Date end = DateUtil.endOfDay(query.getSubmitRange()[1]);
             wrapper.between(Question::getSubmitTime, start, end);
         }
-        if (ObjectUtil.isNotNull(query.getSubmitTime())) {
-            Date start = DateUtil.beginOfDay(query.getSubmitTime());
-            wrapper.ge(Question::getReformDeadline, start);
 
-            Date end = DateUtil.endOfDay(query.getSubmitTime());
-            wrapper.le(Question::getReformDeadline, end);
-        }
         if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
             wrapper.and(w ->
                     w.like(Question::getCheckItem, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRegisterController.java

@@ -71,4 +71,12 @@ public class SafetyCheckRegisterController extends BaseController {
         boolean r = safetyCheckRegisterSerice.grant(dto);
         return success(r);
     }
+
+    @ApiOperation(value = "Web临时登记_保存、提交")
+    @PostMapping("webtempsubmit")
+//    @RequiresPermissions(value = {"core:safetycheck:register","core:safetycheck:appregister"})
+    public AjaxResult webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> dto) {
+        boolean r = safetyCheckRegisterSerice.webSubmit(dto);
+        return success(r);
+    }
 }

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

@@ -162,7 +162,7 @@ public class CoreSafetyTask extends BaseEntity {
      * 提交人
      */
     @ApiModelProperty(value = "提交人")
-    private String submitorId;
+    private Long submitorId;
 
     /**
      * 提交人

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

@@ -1,9 +1,11 @@
 package com.xunmei.core.safetyCheck.service;
 
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.safetyCheck.dto.register.AppPageDto;
 import com.xunmei.core.safetyCheck.dto.register.GrantDto;
 import com.xunmei.core.safetyCheck.vo.regsiter.*;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -43,6 +45,8 @@ public interface SafetyCheckRegisterSerice {
      */
     Boolean webSubmit(TaskRegisterVo<TaskRegisterAreaVo> data);
 
+    Boolean webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> dto);
+
     /**
      * 授权
      * @param dto

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

@@ -11,6 +11,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.utils.bean.BeanUtils;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -39,6 +40,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -274,7 +276,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             pointData.getCheckList().addAll(itemVo.getPointList());
         }
 
-        return submit(pointData);
+        return submit(pointData, false);
     }
 
     /**
@@ -306,11 +308,55 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             }
         }
 
-        return submit(appdata);
+        return submit(appdata, false);
     }
 
+    /**
+     * Web临时登记_保存、提交
+     *
+     * @param data
+     * @return
+     */
+    @Override
+    public Boolean webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> data) {
+        if (ObjectUtil.isNull(data.getId())) {
+            data.setId(IDHelper.id());
+        }
+
+
+//        TaskRegisterVo<AppTaskRegisterPointVo> appdata = new TaskRegisterVo<AppTaskRegisterPointVo>();
+//        BeanUtils.copyProperties(data, appdata);
+//        appdata.setCheckList(new ArrayList<>());
+//        for (TaskRegisterAreaVo areaVo : data.getCheckList()) {
+//            boolean firstPoint = true;
+//
+//            for (TaskRegisterItemVo itemVo : areaVo.getItemList()) {
+//
+//                for (TaskRegisterPointVo pointVo : itemVo.getPointList()) {
+//
+//                    AppTaskRegisterPointVo appPointVo = new AppTaskRegisterPointVo();
+//                    BeanUtils.copyProperties(pointVo, appPointVo);
+//                    BeanUtils.copyProperties(itemVo, appPointVo);
+//                    BeanUtils.copyProperties(areaVo, appPointVo);
+//                    appPointVo.setNfcList(new ArrayList<>());
+//                    if (firstPoint) {
+//                        appPointVo.setNfcList(areaVo.getNfcList());
+//                        firstPoint = false;
+//                    }
+//                    appdata.getCheckList().add(appPointVo);
+//                }
+//            }
+//        }
+        return webSubmit(data);
+    }
+
+    /**
+     * @param data
+     * @param isNewTask 临时登记
+     * @return
+     */
     @Transactional
-    public Boolean submit(TaskRegisterVo<AppTaskRegisterPointVo> data) {
+    public Boolean submit(TaskRegisterVo<AppTaskRegisterPointVo> data, Boolean isNewTask) {
         if (ObjectUtil.isNull(data) || CollectionUtil.isEmpty(data.getCheckList())) {
             throw new ServiceException("检查内容不存在");
         }
@@ -326,7 +372,10 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("任务已完成");
         }
 
-        removeExistData(data.getId());
+        if (!isNewTask) {
+            removeExistData(data.getId());
+        }
+
         LoginUser user = SecurityUtils.getLoginUser();
         List<CoreSafetyTaskData> points = new ArrayList();
         List<CoreSafetyTaskDataNfc> nfcs = new ArrayList<>();
@@ -459,6 +508,53 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
     }
 
     /**
+     * 添加临时任务
+     *
+     * @param data
+     * @param exceptionCount
+     * @param isSubmit
+     * @return
+     */
+    private boolean addTask(TaskRegisterVo data, Integer exceptionCount, Integer isSubmit) {
+        SysOrg beCheckedOrg = remoteOrgService.selectOrgById(data.getBeCheckedOrgId(), SecurityConstants.INNER);
+        SysOrg checkOrg = remoteOrgService.selectOrgById(data.getCheckOrgId(), SecurityConstants.INNER);
+
+        CoreSafetyTask task = new CoreSafetyTask();
+        task.setId(task.getId());
+        task.setTitle(data.getTaskName());
+        task.setCount(1);
+        task.setExceptionCount(exceptionCount.longValue());
+        task.setOrgId(data.getBeCheckedOrgId());
+        task.setOrgName(beCheckedOrg.getShortName());
+        task.setOrgPath(beCheckedOrg.getPath());
+        task.setCheckOrgId(data.getCheckOrgId());
+        task.setCheckOrgName(checkOrg.getShortName());
+        task.setStatus(ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue());
+        task.setSourceType(1L);
+        task.setBatchId(IDHelper.id());
+        task.setCheckTeam(data.getCheckTeam());
+        task.setDeleted(0L);
+        task.setRoleId(((IdNameVo) data.getCheckRoles().get(0)).getId());
+        task.setPlanStartTime(data.getPlanStartTime());
+        task.setPlanEndTime(data.getPlanEndTime());
+        task.setStartTime(new Date());
+        task.setEndTime(new Date());
+        Ymd ymd = Ymd.of(data.getYmdDate());
+        task.setYmdDate(ymd.getDate());
+        task.setYmdDay(ymd.getDay().longValue());
+        task.setYmdMonth(ymd.getMonth().longValue());
+        task.setYmdQuarter(ymd.getQuarter().longValue());
+        task.setYmdWeek(ymd.getWeek().longValue());
+        task.setYmdYear(ymd.getYear().longValue());
+        task.setYmdHalfyear(ymd.getHalfyear().longValue());
+        task.setSubmitTime(new Date());
+        task.setSubmitorId(SecurityUtils.getUserId());
+        task.setSubmitBy(SecurityUtils.getLoginUser().getName());
+
+        return baseMapper.insert(task) > 0;
+    }
+
+    /**
      * 保存前删除之前保存的数据
      *
      * @param taskId