教育培训需求变更 代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskInsertDto.java

@@ -0,0 +1,42 @@
+package com.xunmei.common.core.domain.edu.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CoreEduTrainingTaskInsertDto {
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "培训开始时间")
+    private Date trainingStartDateTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "培训截止时间")
+    private Date trainingEndDateTime;
+
+    @ApiModelProperty(value = "培训主题")
+    private String title;
+
+    @ApiModelProperty(value = "培训内容")
+    private String content;
+
+    @ApiModelProperty(value = "总结")
+    private String note;
+
+    @ApiModelProperty(value = "图片")
+    private String imageList;
+
+    @ApiModelProperty(value = "提交类型", notes = "1:暂存,2:提交")
+    private Integer submitType;
+
+    private List<String> fileList;
+
+    @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
+    private List<CoreEduTrainingTaskToUser> taskUserList;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/domain/CoreSafetyIndexCalculateRule.java

@@ -68,7 +68,9 @@ public class CoreSafetyIndexCalculateRule extends BaseEntity {
     @ApiModelProperty(value = "周期，只有在指标分类为安保履职时使用")
     private Integer cycle;
 
-
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/vo/CoreSafetyIndexCalculateRuleDetailVo.java

@@ -1,6 +1,7 @@
 package com.xunmei.common.core.domain.safetyindex.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ public class CoreSafetyIndexCalculateRuleDetailVo {
 
     private Long id;
 
-    @JsonIgnore
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("机构类型")
     private Integer orgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingTaskController.java

@@ -1,11 +1,7 @@
 package com.xunmei.core.edu.controller;
 
 
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskSignDto;
+import com.xunmei.common.core.domain.edu.dto.*;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -61,8 +57,8 @@ public class CoreEduTrainingTaskController extends BaseController {
     @ApiOperation(value = "新增教育任务")
     @RequiresPermissions("core:eduTask:add")
     @Log(title = "教育任务", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CoreEduTrainingTask coreEduTrainingTask) {
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody CoreEduTrainingTaskInsertDto coreEduTrainingTask) {
         return toAjax(coreEduTrainingTaskService.insertCoreEduTrainingTask(coreEduTrainingTask));
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ICoreEduTrainingTaskService.java

@@ -4,10 +4,7 @@ package com.xunmei.core.edu.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskSignDto;
+import com.xunmei.common.core.domain.edu.dto.*;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
@@ -49,7 +46,7 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
      * @param coreEduTrainingTask 教育任务
      * @return 结果
      */
-    int insertCoreEduTrainingTask(CoreEduTrainingTask coreEduTrainingTask);
+    int insertCoreEduTrainingTask(CoreEduTrainingTaskInsertDto coreEduTrainingTask);
 
     /**
      * 修改教育任务

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -16,10 +16,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.edu.domain.*;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskSignDto;
+import com.xunmei.common.core.domain.edu.dto.*;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
@@ -50,6 +47,7 @@ import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -206,14 +204,37 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     /**
      * 新增教育任务
      *
-     * @param coreEduTrainingTask 教育任务
+     * @param request 教育任务
      * @return 结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertCoreEduTrainingTask(CoreEduTrainingTask coreEduTrainingTask) {
-        coreEduTrainingTask.setCreateTime(DateUtils.getNowDate());
-        return coreEduTrainingTaskMapper.insert(coreEduTrainingTask);
+    public int insertCoreEduTrainingTask(CoreEduTrainingTaskInsertDto request) {
+        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(
+                () -> orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        CoreEduTrainingTask task=new CoreEduTrainingTask();
+        task.setId(IdWorker.getId());
+        task.setOrgId(sysOrg.getId());
+        task.setOrgName(sysOrg.getName());
+        task.setOrgPath(sysOrg.getPath());
+        BeanUtils.copyProperties(request,task);
+        task.setCreateTime(DateUtils.getNowDate());
+        if (ObjectUtil.isNotEmpty(request.getFileList())) {
+            task.setFileList(com.alibaba.fastjson.JSON.toJSONString(request.getFileList()));
+        }
+        List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
+        if (ObjectUtil.isNotEmpty(taskUserList)) {
+            checkTheSameUser(taskUserList);
+            for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
+                taskToUser.setEduTrainingTaskId(task.getId());
+                taskToUser.setSign(0);
+            }
+            coreEduTrainingTaskToUserService.saveBatch(taskUserList);
+        }
+        task.setHostId(getHostUserId(task.getOrgId()));
+        task.setRecorderId(SecurityUtils.getUserId());
+        task.setStatus(EduTrainingDoStatus.WAIT_SIGN.getCode());
+        return coreEduTrainingTaskMapper.insert(task);
     }
 
     /**
@@ -239,15 +260,10 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         } else {
             coreEduTrainingTask.setFileList(null);
         }
-        List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                roleService.selectUserByRoleNameAndOrgId("网点负责人", coreEduTrainingTask.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
-        if (ObjectUtil.isNotEmpty(userList)) {
-            coreEduTrainingTask.setHostId(userList.get(0).getId());
-        } else {
-            coreEduTrainingTask.setHostId(SecurityUtils.getUserId());
-        }
 
 
+        coreEduTrainingTask.setHostId(getHostUserId(coreEduTrainingTask.getOrgId()));
+
 //        if (ObjectUtil.isNotEmpty(request.getTaskUserList())) {
 //            taskUserList = request.getTaskUserList();
 //        }
@@ -278,6 +294,16 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         return coreEduTrainingTaskMapper.updateById(coreEduTrainingTask);
     }
 
+    private Long getHostUserId(Long orgId){
+        List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                roleService.selectUserByRoleNameAndOrgId("网点负责人", orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
+        if (ObjectUtil.isNotEmpty(userList)) {
+         return userList.get(0).getId();
+        } else {
+           return SecurityUtils.getUserId();
+        }
+    }
+
     private void checkTheSameUser(List<CoreEduTrainingTaskToUser> taskUserList) {
         Map<Integer, List<CoreEduTrainingTaskToUser>> listMap = taskUserList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToUser::getType));
         List<CoreEduTrainingTaskToUser> userList = listMap.get(1);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyIndexCalculateRuleServiceImpl.java

@@ -20,6 +20,7 @@ import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.safetyindex.mapper.CoreSafetyIndexCalculateRuleItemMapper;
 import com.xunmei.core.safetyindex.mapper.CoreSafetyIndexCalculateRuleMapper;
 import com.xunmei.core.safetyindex.service.ICoreSafetyDictService;
 import com.xunmei.core.safetyindex.service.ICoreSafetyIndexCalculateRuleItemService;
@@ -49,7 +50,8 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
     private ICoreSafetyDictService safetyDictService;
     @Autowired
     private ICoreSafetyIndexCalculateRuleItemService ruleItemService;
-
+    @Autowired
+    private CoreSafetyIndexCalculateRuleItemMapper ruleItemMapper;
     @Override
     public TableDataInfo<CoreSafetyIndexCalculateRulePageVo> selectPage(CoreSafetyIndexCalculateRulePageDto request) {
 
@@ -159,6 +161,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         BeanUtils.copyProperties(request, coreSafetyIndexCalculateRule);
         coreSafetyIndexCalculateRule.setUpdateBy(SecurityUtils.getUserId().toString());
         coreSafetyIndexCalculateRule.setUpdateTime(new Date());
+        ruleItemMapper.delete(new LambdaQueryWrapper<CoreSafetyIndexCalculateRuleItem>().eq(CoreSafetyIndexCalculateRuleItem::getRuleId, request.getId()));
         List<CoreSafetyIndexCalculateRuleItemUpdateDto> itemList = request.getItemList();
         List<CoreSafetyIndexCalculateRuleItem> properties = BeanHelper.copyProperties(itemList, CoreSafetyIndexCalculateRuleItem.class);
         properties.forEach(r->{
@@ -168,8 +171,9 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
                 r.setCreateBy(SecurityUtils.getUserId().toString());
                 r.setCreateTime(new Date());
             }
+            r.setRuleId(request.getId());
         });
-        ruleItemService.saveOrUpdateBatch(properties);
+        ruleItemService.saveBatch(properties);
         return coreSafetyIndexCalculateRuleMapper.updateById(coreSafetyIndexCalculateRule);
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/safetyindex/CoreSafetyIndexCalculateRuleMapper.xml

@@ -218,8 +218,11 @@
         <if test="request.orgType !=null">
             and t.org_type = #{request.orgType}
         </if>
+        <if test="request.typeCode !=null">
+            and t.type_code = #{request.typeCode}
+        </if>
         <if test="request.projectCode !=null">
-            and t.project_code = #{request.pointCode}
+            and t.project_code = #{request.projectCode}
         </if>
         <if test="request.pointCode !=null">
             and t.point_code = #{request.pointCode}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysMenu.java

@@ -1,18 +1,16 @@
 package com.xunmei.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.xunmei.common.core.constant.Constants;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.xunmei.common.core.web.domain.BaseEntity;
 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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +33,7 @@ public class SysMenu extends BaseEntity {
      * 菜单ID
      */
 
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
     /**
@@ -47,6 +46,7 @@ public class SysMenu extends BaseEntity {
      * 父菜单ID
      */
     @ApiModelProperty(value = "父菜单ID")
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long parentId;
 
     /**