Browse Source

咨询进度表开发

anderx 1 year ago
parent
commit
fa45c1fa01

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TaskDetailsExtendMapper.xml

@@ -42,14 +42,14 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_details_extend(rd_reserves_status, rd_reserves_other, rd_award_compensation_status,
+        insert into task_details_extend(id,rd_reserves_status, rd_reserves_other, rd_award_compensation_status,
                                         rd_award_compensation_other, rd_application_fee, rd_announcement_amount,
                                         ad_deliver_status, ad_deliver_other, ad_deliver_finish, ht_deliver_status,
                                         ht_deliver_other, ht_deliver_finish, close_meeting_status, close_meeting__other,
                                         phased_type, phased_content, prject_approval_write_number,
                                         prject_approval_write_rate, ad_prepare_july_status, ad_prepare_july_other,
                                         ad_prepare_october_status, ad_prepare_october_other)
-        values (#{rdReservesStatus}, #{rdReservesOther}, #{rdAwardCompensationStatus}, #{rdAwardCompensationOther},
+        values (#{id},#{rdReservesStatus}, #{rdReservesOther}, #{rdAwardCompensationStatus}, #{rdAwardCompensationOther},
                 #{rdApplicationFee}, #{rdAnnouncementAmount}, #{adDeliverStatus}, #{adDeliverOther}, #{adDeliverFinish},
                 #{htDeliverStatus}, #{htDeliverOther}, #{htDeliverFinish}, #{closeMeetingStatus}, #{closeMeeting_Other},
                 #{phasedType}, #{phasedContent}, #{prjectApprovalWriteNumber}, #{prjectApprovalWriteRate},

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TaskDetailsSupplementMapper.xml

@@ -45,13 +45,13 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_details_supplement(ip_declare, ip_authorize, ip_ht, ip_ht_i, ip_ht_ii, outsourcing_dev,
+        insert into task_details_supplement(id,ip_declare, ip_authorize, ip_ht, ip_ht_i, ip_ht_ii, outsourcing_dev,
                                             contract_registration, public_release_stipulation, public_release_actual,
                                             training_stipulation, training_actual, training_other, special_inspect,
                                             simulated_audit, ht_score, ht_batch, ht_focus, web_submit, web_submit_other,
                                             paper_submit, paper_submit_other, review_province, review_country,
                                             review_province_number, review_country_number)
-        values (#{ipDeclare}, #{ipAuthorize}, #{ipHt}, #{ipHtI}, #{ipHtIi}, #{outsourcingDev}, #{contractRegistration},
+        values (#{id},#{ipDeclare}, #{ipAuthorize}, #{ipHt}, #{ipHtI}, #{ipHtIi}, #{outsourcingDev}, #{contractRegistration},
                 #{publicReleaseStipulation}, #{publicReleaseActual}, #{trainingStipulation}, #{trainingActual},
                 #{trainingOther}, #{specialInspect}, #{simulatedAudit}, #{htScore}, #{htBatch}, #{htFocus},
                 #{webSubmit}, #{webSubmitOther}, #{paperSubmit}, #{paperSubmitOther}, #{reviewProvince},

+ 3 - 0
src/main/java/com/goafanti/common/model/TaskDetails.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -365,6 +367,7 @@ public class TaskDetails implements Serializable {
         this.aid = aid;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -31,7 +31,7 @@ public class TaskDetailsController extends BaseController {
 
 
     /**
-     * 新增项目详情数据
+     * 新增项目进度数据
      *
      * @param taskDetails 实体
      * @return 新增结果
@@ -43,7 +43,7 @@ public class TaskDetailsController extends BaseController {
 
 
     /**
-     * 通过主键查询单条数据
+     * 查询项目进度单条数据
      *
      * @param id 主键
      * @return 单条数据
@@ -55,14 +55,14 @@ public class TaskDetailsController extends BaseController {
 
 
     /**
-     * 编辑数据
+     * 编辑项目进度数据
      *
      * @param taskDetails 实体
      * @return 编辑结果
      */
     @PostMapping("/update")
-    public Result edit(TaskDetails taskDetails) {
-        return new Result<>().data(this.taskDetailsService.update(taskDetails));
+    public Result edit(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp) {
+        return new Result<>().data(this.taskDetailsService.update(taskDetails, taskDetailsExtend, taskDetailsSupp));
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.goafanti.techproject.service;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.common.model.TaskDetailsExtend;
 import com.goafanti.common.model.TaskDetailsSupplement;
+import com.goafanti.techproject.bo.TaskDetailsBo;
 
 /**
  * 项目申报详情(TaskDetails)表服务接口
@@ -18,7 +19,7 @@ public interface TaskDetailsService {
      * @param id 主键
      * @return 实例对象
      */
-    TaskDetails queryById(Integer id);
+    TaskDetailsBo queryById(Integer id);
 
 
     /**
@@ -27,7 +28,7 @@ public interface TaskDetailsService {
      * @param taskDetails 实例对象
      * @return 实例对象
      */
-    TaskDetails insert(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp);
+    TaskDetailsBo insert(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp);
 
     /**
      * 修改数据
@@ -35,7 +36,7 @@ public interface TaskDetailsService {
      * @param taskDetails 实例对象
      * @return 实例对象
      */
-    TaskDetails update(TaskDetails taskDetails);
+    TaskDetailsBo update(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp);
 
     /**
      * 通过主键删除数据

+ 31 - 9
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -54,8 +54,21 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetails queryById(Integer id) {
-        return this.taskDetailsMapper.selectById(id);
+    public TaskDetailsBo queryById(Integer id) {
+        TaskDetailsBo taskDetailsBo = new TaskDetailsBo();
+        TaskDetails taskDetails = this.taskDetailsMapper.selectById(id);
+        TaskDetailsExtend taskDetailsExtend = taskDetailsExtendMapper.selectById(id);
+        TaskDetailsSupplement taskDetailsSupplement = taskDetailsSupplementMapper.selectById(id);
+        if (taskDetails != null){
+            try {
+                BeanUtils.copyProperties(taskDetailsBo,taskDetails );
+                BeanUtils.copyProperties( taskDetailsBo,taskDetailsExtend);
+                BeanUtils.copyProperties( taskDetailsBo,taskDetailsSupplement);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return taskDetailsBo;
     }
 
 
@@ -80,11 +93,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         }
         TaskDetailsBo taskDetailsBo = new TaskDetailsBo();
         try {
-            BeanUtils.copyProperties(taskDetails, taskDetailsBo);
-            BeanUtils.copyProperties(taskDetailsExtend, taskDetailsBo);
-            BeanUtils.copyProperties(taskDetailsSupp, taskDetailsBo);
+            BeanUtils.copyProperties(taskDetailsBo,taskDetails );
+            BeanUtils.copyProperties( taskDetailsBo,taskDetailsExtend);
+            BeanUtils.copyProperties( taskDetailsBo,taskDetailsSupp);
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
         return taskDetailsBo;
     }
@@ -96,8 +109,14 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetails update(TaskDetails taskDetails) {
-        this.taskDetailsMapper.update(taskDetails);
+    public TaskDetailsBo update(TaskDetails taskDetails, TaskDetailsExtend taskDetailsExtend, TaskDetailsSupplement taskDetailsSupp) {
+        if (taskDetails.getId()!=null){
+            taskDetailsExtend.setId(taskDetails.getId());
+            taskDetailsSupp.setId(taskDetails.getId());
+            this.taskDetailsMapper.update(taskDetails);
+            taskDetailsExtendMapper.update(taskDetailsExtend);
+            taskDetailsSupplementMapper.update(taskDetailsSupp);
+        }
         return this.queryById(taskDetails.getId());
     }
 
@@ -109,6 +128,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      */
     @Override
     public boolean deleteById(Integer id) {
-        return this.taskDetailsMapper.deleteById(id) > 0;
+        this.taskDetailsMapper.deleteById(id);
+        taskDetailsExtendMapper.deleteById(id);
+        taskDetailsSupplementMapper.deleteById(id);
+        return true;
     }
 }