Browse Source

项目特色工作

anderx 1 year ago
parent
commit
6d8e7f2ef9

+ 2 - 0
src/main/java/com/goafanti/common/dao/TaskFeatureMapper.java

@@ -82,5 +82,7 @@ public interface TaskFeatureMapper {
      */
     int deleteById(Integer id);
 
+
+    List<TaskFeature> selectByTdId(Integer id);
 }
 

+ 8 - 0
src/main/java/com/goafanti/common/mapper/TaskFeatureMapper.xml

@@ -208,10 +208,18 @@ create_time = values(create_time)
         </where>
     </select>
 
+
     <!--通过主键删除-->
     <delete id="deleteById">
         delete from task_feature where id = #{id}
     </delete>
 
+
+    <select id="selectByTdId" resultMap="TaskFeatureMap">
+        select
+        <include refid="TaskFeatureAllSql"/>
+        from task_feature
+        where tdid = #{id}
+    </select>
 </mapper>
 

+ 22 - 4
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -33,16 +33,17 @@ public class TaskDetailsController extends BaseController {
      * 新增项目进度数据
      *
      * @param taskDetails 实体
+     * @param type        0=初步新增,1=新增切同步日志
      * @return 新增结果
      */
     @PostMapping("/add")
-    public Result<TaskDetails> add(TaskDetails taskDetails, TaskFeature taskFeature) {
+    public Result<TaskDetails> add(TaskDetails taskDetails,Integer type) {
         Result<TaskDetails> res = new Result<>();
         if (taskDetailsService.checkTid(taskDetails)){
             res.getError().add(buildError("项目进度与年份", ErrorConstants.PARAM_BEING_ERROR));
             return res;
         }
-        return res.data(this.taskDetailsService.insert(taskDetails,taskFeature));
+        return res.data(this.taskDetailsService.insert(taskDetails,type));
     }
 
 
@@ -76,8 +77,8 @@ public class TaskDetailsController extends BaseController {
      * @return 编辑结果
      */
     @PostMapping("/update")
-    public Result edit(TaskDetails taskDetails, TaskFeature taskFeature) {
-        return new Result<>().data(this.taskDetailsService.update(taskDetails,  taskFeature));
+    public Result edit(TaskDetails taskDetails) {
+        return new Result<>().data(this.taskDetailsService.update(taskDetails));
     }
 
     /**
@@ -112,5 +113,22 @@ public class TaskDetailsController extends BaseController {
         return this.taskDetailsService.export(id);
     }
 
+    @PostMapping("/addTaskFeature")
+    public Result<TaskFeature> addTaskFeature(TaskFeature in) {
+        Result<TaskFeature> res = new Result<>();
+        return res.data(this.taskDetailsService.addFeature(in));
+    }
+
+    /**
+     * 编辑项目进度数据
+     *
+     * @param in 实体
+     * @return 编辑结果
+     */
+    @PostMapping("/updateTaskFeature")
+    public Result<TaskFeature> updateTaskFeature(TaskFeature in) {
+        return new Result<>().data(this.taskDetailsService.updateFeature(in));
+    }
+
 }
 

+ 5 - 3
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -28,16 +28,15 @@ public interface TaskDetailsService {
      * @param taskDetails 实例对象
      * @return 实例对象
      */
-    TaskDetails insert(TaskDetails taskDetails,TaskFeature taskFeature);
+    TaskDetails insert(TaskDetails taskDetails,Integer type);
 
     /**
      * 修改数据
      *
      * @param taskDetails 实例对象
-     * @param taskFeature
      * @return 实例对象
      */
-    TaskDetails update(TaskDetails taskDetails, TaskFeature taskFeature);
+    TaskDetails update(TaskDetails taskDetails);
 
     /**
      * 通过主键删除数据
@@ -63,5 +62,8 @@ public interface TaskDetailsService {
 
     TaskFeature addFeature(TaskFeature in);
 
+
+
+
     TaskFeature updateFeature(TaskFeature in);
 }

+ 27 - 15
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -136,7 +136,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetails insert(TaskDetails taskDetails,TaskFeature taskFeature) {
+    public TaskDetails insert(TaskDetails taskDetails,Integer type) {
         TOrderNew tOrderNew =tOrderNewMapper.selectByTid(taskDetails.getTid());
         taskDetails.setUid(tOrderNew.getBuyerId());
         taskDetails.setCreateTime(new Date());
@@ -144,13 +144,20 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         //数据计算
         countTaskDetails(taskDetails);
         this.taskDetailsMapper.insert(taskDetails);
-        taskFeature.setId(taskDetails.getId());
-        this.taskFeatureMapper.insert(taskFeature);
-        addTaskDetailsLog(taskDetails,taskFeature);
+        //新增日志数据
+        if (type==1){
+            addTaskDetailsLog(taskDetails);
+        }
         return taskDetails;
     }
 
-    private void addTaskDetailsLog(TaskDetails taskDetails,TaskFeature taskFeature) {
+    /**
+     *新增的时候特殊数据可以是单传输,修改的时候可以多传
+     *
+     * @param taskDetails 项目进度数据
+     *
+     */
+    private void addTaskDetailsLog(TaskDetails taskDetails) {
         Admin adminToken = TokenManager.getAdminToken();
         TaskDetailsLog log=new TaskDetailsLog();
         BeanUtils.copyProperties(taskDetails, log);
@@ -159,13 +166,17 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         log.setAid(adminToken.getId());
         log.setAname(adminToken.getName());
         taskDetailsLogMapper.insert(log);
-        TaskFeatureLog tfLog = new TaskFeatureLog();
-        BeanUtils.copyProperties(taskFeature, tfLog);
-        tfLog.setTdlId(log.getId());
-        tfLog.setId(null);
-        tfLog.setAid(adminToken.getId());
-        tfLog.setAname(adminToken.getName());
-        taskFeatureLogMapper.insert(tfLog);
+        List<TaskFeature> list = taskFeatureMapper.selectByTdId(taskDetails.getId());
+        for (TaskFeature feature : list) {
+            TaskFeatureLog tfLog = new TaskFeatureLog();
+            BeanUtils.copyProperties(feature, tfLog);
+            tfLog.setTdlId(log.getId());
+            tfLog.setId(null);
+            tfLog.setAid(adminToken.getId());
+            tfLog.setAname(adminToken.getName());
+            taskFeatureLogMapper.insert(tfLog);
+        }
+
     }
 
     private void countTaskDetails(TaskDetails taskDetails) {
@@ -217,16 +228,15 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * 修改数据
      *
      * @param taskDetails 实例对象
-     * @param taskFeature
      * @return 实例对象
      */
     @Override
-    public TaskDetails update(TaskDetails taskDetails, TaskFeature taskFeature) {
+    public TaskDetails update(TaskDetails taskDetails) {
         taskDetails.setUpdateTime(new Date());
         this.taskDetailsMapper.update(taskDetails);
         countTaskDetails(taskDetails);
         TaskDetails res = this.queryById(taskDetails.getId());
-        addTaskDetailsLog(res,taskFeature);
+        addTaskDetailsLog(res);
         return res;
     }
 
@@ -278,4 +288,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         taskFeatureMapper.update(in);
         return taskFeatureMapper.selectById(in.getId());
     }
+
+
 }