项目级别编辑

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectLevelController.java

@@ -4,6 +4,8 @@ package com.management.platform.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Project;
 import com.management.platform.entity.ProjectLevel;
+import com.management.platform.entity.TimeType;
+import com.management.platform.mapper.TimeTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectLevelService;
 import com.management.platform.service.ProjectService;
@@ -33,6 +35,8 @@ public class ProjectLevelController {
     private UserMapper userMapper;
     @Resource
     private ProjectService projectService;
+    @Resource
+    private TimeTypeMapper timeTypeMapper;
     @RequestMapping("/addOrMod")
     public HttpRespMsg addOrMod(HttpServletRequest request, ProjectLevel projectLevel){
         return projectLevelService.addOrMod(request,projectLevel);
@@ -46,14 +50,18 @@ public class ProjectLevelController {
         return httpRespMsg;
     }
     @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id){
+    public HttpRespMsg delete(Integer id,HttpServletRequest request){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
-        int cut = projectService.count(new QueryWrapper<Project>().eq("project_level_id", id));
-        if(cut>0){
-            httpRespMsg.setError("已绑定项目");
-            return httpRespMsg;
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        TimeType timeType = timeTypeMapper.selectById(companyId);
+        if(timeType.getProjectLevelState()==1){
+            int cut = projectService.count(new QueryWrapper<Project>().eq("level", id).eq("company_id",companyId));
+            if(cut>0){
+                httpRespMsg.setError("已绑定项目");
+                return httpRespMsg;
+            }
+            projectLevelService.removeById(id);
         }
-        projectLevelService.removeById(id);
         return httpRespMsg;
     }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/GtemplateTask.java

@@ -1,16 +1,15 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.time.LocalDate;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.apache.poi.ss.formula.functions.T;
+
+import java.io.Serializable;
+import java.time.LocalDate;
 
 /**
  * <p>
@@ -18,7 +17,7 @@ import org.apache.poi.ss.formula.functions.T;
  * </p>
  *
  * @author Seyason
- * @since 2022-03-27
+ * @since 2022-07-26
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -72,6 +71,9 @@ public class GtemplateTask extends Model<GtemplateTask> {
     @TableField("gtemplate_id")
     private Integer gtemplateId;
 
+    @TableField("task_desc")
+    private String taskDesc;
+
 
     @Override
     protected Serializable pkVal() {
@@ -86,6 +88,7 @@ public class GtemplateTask extends Model<GtemplateTask> {
         item.setSeq(task.getSeq());
         item.setTaskLevel(task.getTaskLevel());
         item.setTaskType(task.getTaskType());
+        item.setTaskDesc(task.getTaskDesc());
         return item;
     }
 
@@ -96,6 +99,7 @@ public class GtemplateTask extends Model<GtemplateTask> {
         task.setTaskType(taskType);
         task.setCompanyId(companyId);
         task.setSeq(seq);
+        task.setTaskDesc(taskDesc);
         task.setCreateDate(LocalDate.now());
         return task;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/GroupTemplateServiceImpl.java

@@ -85,6 +85,7 @@ public class GroupTemplateServiceImpl extends ServiceImpl<GroupTemplateMapper, G
                     List<GtemplateTask> gtemplateTaskList = new ArrayList<>();
                     if (filterTaskList.size() > 0) {
                         filterTaskList.forEach(f->{
+                            System.out.println(f);
                             GtemplateTask item = GtemplateTask.fromTask(f);
                             item.setGtemplateId(template.getId());
                             Optional<Stages> first = stagesList.stream().filter(s -> s.getId().equals(f.getStagesId())).findFirst();

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/GtemplateTaskMapper.xml

@@ -12,11 +12,12 @@
         <result column="seq" property="seq" />
         <result column="task_type" property="taskType" />
         <result column="gtemplate_id" property="gtemplateId" />
+        <result column="task_desc" property="taskDesc" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, task_level, tstages_id, company_id, seq, task_type, gtemplate_id
+        id, name, task_level, tstages_id, company_id, seq, task_type, gtemplate_id, task_desc
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -99,7 +99,7 @@
         ${ew.customSqlSegment}
     </select>
     <select id="nameList" resultMap="BaseResultMap">
-        select id, name, task_level, stages_id, company_id, indate,  group_id, seq,task_type
+        select id, name, task_level, stages_id, company_id, indate,  group_id, seq,task_type,task_desc
         from task
         ${ew.customSqlSegment}
     </select>