Browse Source

字段更改与代码中赋值更改

buzhanyi 2 years ago
parent
commit
220a2de950

+ 8 - 5
purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -46,14 +46,16 @@ public class PlanYearsController extends BaseController {
     public AjaxResult add(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         //获取采购单位-
         LoginUser loginUser = tokenService.getLoginUser(request);
-        yearsStandardVo.setPurchaseUnit(loginUser.getDeptId());
-        yearsStandardVo.setCreateBy(String.valueOf(loginUser.getUserId()));
+        yearsStandardVo.setPurchaseDeptId(loginUser.getDeptId());
+        yearsStandardVo.setCreated(String.valueOf(loginUser.getUserId()));
         return planYearsService.insertPlanYears(yearsStandardVo);
     }
 
     @ApiOperation(value = "修改年度计划")
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+    public AjaxResult update(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        yearsStandardVo.setUpdated(String.valueOf(loginUser.getUserId()));
         return planYearsService.update(yearsStandardVo);
     }
 
@@ -92,8 +94,9 @@ public class PlanYearsController extends BaseController {
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<PlanYears> util = new ExcelUtil<>(PlanYears.class);
         List<PlanYears> planYears = util.importExcel(file.getInputStream());
-        String operName = getUsername();
-        String message = planYearsService.importPlanYears(planYears, updateSupport, operName);
+        //获取采购单位-
+        LoginUser loginUser = getLoginUser();
+        String message = planYearsService.importPlanYears(planYears, updateSupport, loginUser);
         return success(message);
     }
 

+ 2 - 2
purchase-admin/src/main/resources/application-dev.yml

@@ -9,8 +9,8 @@ purchase:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/purchase/uploadPath,Linux配置 /home/purchase/uploadPath)
-  # profile: C:/purchase/uploadPath
-  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
+  profile: D:/purchase/uploadPath
+  #  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

+ 1 - 1
purchase-admin/src/main/resources/application.yml

@@ -2,7 +2,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 9125
+  port: 8055
   servlet:
     # 应用的访问路径
     context-path: /

+ 22 - 13
purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -25,7 +25,7 @@ public class PlanYears extends BaseEntity {
      */
     @NotNull(message = "采购单位不能为空")
     @Excel(name = "采购单位")
-    private Long purchaseUnit;
+    private Long purchaseDeptId;
     /**
      * 项目名称
      */
@@ -47,7 +47,7 @@ public class PlanYears extends BaseEntity {
     /**
      * 概算金额(万元(保留小数点后两位)
      */
-    @Excel(name = "概算金额")
+    @Excel(name = "概算金额(万元)")
     @NotNull(message = "概算金额不能为空")
     private BigDecimal evaluation;
     /**
@@ -70,36 +70,36 @@ public class PlanYears extends BaseEntity {
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期(具体到月)
      */
-    @Excel(name = "计划提报需求时间")
+    @Excel(name = "提报需求时间")
     @NotNull(message = "计划提报需求时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date demandCommitTime;
+    private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期,即填制中标信息的日期(具体到月)
      */
-    @Excel(name = "计划完成采购时间")
+    @Excel(name = "完成采购时间")
     @NotNull(message = "计划完成采购时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purchaseFinishTime;
+    private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后,使用单位收到标的日期,即填制建设文档的日期
      */
-    @Excel(name = "计划交付时间")
+    @Excel(name = "交付(实施)时间")
     @NotNull(message = "计划交付时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date deliverTime;
+    private Date planDeliverTime;
     /**
      * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
      */
     @Excel(name = "项目属性")
     @NotNull(message = "项目属性不能为空")
-    private String projectAttribute;
+    private String projectAtt;
     /**
      * 计划调整情况及理由--->如计划需要变更,在填写申请修改时需填写调整情况及理由,审核单位审核通过后显示
      */
     @Excel(name = "计划调整情况及理由")
     @NotNull(message = "计划调整情况及理由不能为空")
-    private String readjustOfPlan;
+    private String adjustReason;
     /**
      * 备注
      */
@@ -114,7 +114,7 @@ public class PlanYears extends BaseEntity {
     /**
      * 退回原因--->审核不通过就是退回
      */
-    private String reasonOfReturn;
+    private String refuseReason;
     /**
      * 项目附件
      */
@@ -122,16 +122,25 @@ public class PlanYears extends BaseEntity {
     /**
      * 创建者
      */
-    private String createBy;
+    private String created;
     /**
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+    /**
+     * 更改者
+     */
+    private String updated;
+    /**
+     * 更改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
     /**
      * 逻辑删除字段--->(0:正常,1:已删除)
      */
-    private Integer isDelete;
+    private Integer delFlay;
 
 
 }

+ 16 - 6
purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanYearsStandardVo.java

@@ -25,7 +25,7 @@ public class PlanYearsStandardVo extends BaseEntity {
      * 采购单位(登录账号的单位)
      */
     @ApiModelProperty(value = "采购单位")
-    private Long purchaseUnit;
+    private Long purchaseDeptId;
 
     /**
      * 项目名称
@@ -74,27 +74,27 @@ public class PlanYearsStandardVo extends BaseEntity {
      */
     @ApiModelProperty(value = "计划提报需求时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date demandCommitTime;
+    private Date planDemandSubTime;
 
     /**
      * 计划完成采购时间--->公示中标结果的日期,即填制中标信息的日期(具体到月)
      */
     @ApiModelProperty(value = "计划完成采购时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purchaseFinishTime;
+    private Date planPurchaseFinishTime;
 
     /**
      * 计划交付时间--->供应商完成并交付后,使用单位收到标的日期,即填制建设文档的日期
      */
     @ApiModelProperty(value = "计划交付时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date deliverTime;
+    private Date planDeliverTime;
 
     /**
      * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
      */
     @ApiModelProperty(value = "项目属性")
-    private String projectAttribute;
+    private String projectAtt;
 
     /**
      * 项目状态--->包括计划待提交、计划待审核、计划已退回、计划已审核
@@ -102,6 +102,11 @@ public class PlanYearsStandardVo extends BaseEntity {
     @ApiModelProperty(value = "项目状态(0:计划待提交,1:计划待审核,2:计划已退回,3:计划已审核)")
     private String projectStatus;
 
+    /**
+     * 退回原因--->审核不通过就是退回
+     */
+    private String refuseReason;
+
     /**
      * 备注
      */
@@ -121,5 +126,10 @@ public class PlanYearsStandardVo extends BaseEntity {
     /**
      * 创建者
      */
-    private String createBy;
+    private String created;
+
+    /**
+     * 更改者
+     */
+    private String updated;
 }

+ 10 - 6
purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -22,7 +22,7 @@ public class PlanYearsResponseVo {
      * 采购单位(登录账号的单位)
      */
     @Excel(name = "采购单位")
-    private Long purchaseUnit;
+    private Long purchaseDeptId;
     /**
      * 项目名称
      */
@@ -63,29 +63,29 @@ public class PlanYearsResponseVo {
      */
     @Excel(name = "计划提报需求时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date demandCommitTime;
+    private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期,即填制中标信息的日期(具体到月)
      */
     @Excel(name = "计划完成采购时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purchaseFinishTime;
+    private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后,使用单位收到标的日期,即填制建设文档的日期
      */
     @Excel(name = "计划交付时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date deliverTime;
+    private Date planDeliverTime;
     /**
      * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
      */
     @Excel(name = "项目属性")
-    private String projectAttribute;
+    private String projectAtt;
     /**
      * 计划调整情况及理由--->如计划需要变更,在填写申请修改时需填写调整情况及理由,审核单位审核通过后显示
      */
     @Excel(name = "计划调整情况及理由")
-    private String readjustOfPlan;
+    private String adjustReason;
     /**
      * 备注
      */
@@ -97,6 +97,10 @@ public class PlanYearsResponseVo {
      */
     @Excel(name = "项目状态")
     private String projectStatus;
+    /**
+     * 退回原因--->审核不通过就是退回
+     */
+    private String refuseReason;
     /**
      * 项目附件
      */

+ 2 - 1
purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -2,6 +2,7 @@ package com.ozs.plan.service;
 
 
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 
@@ -66,7 +67,7 @@ public interface PlanYearsService {
      *
      * @return 结果
      */
-    public String importPlanYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName);
+    public String importPlanYears(List<PlanYears> planYears, boolean isUpdateSupport, LoginUser loginUser);
 
     /**
      * 提交年度计划

+ 49 - 61
purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -2,6 +2,7 @@ package com.ozs.plan.service.impl;
 
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDictData;
+import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.exception.ServiceException;
@@ -67,29 +68,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             e.printStackTrace();
         }
         //判断是否为超额计划
-        BigDecimal evaluation = yearsStandardVo.getEvaluation();
-        BigDecimal threshold = new BigDecimal(0);
-        //获取各个项目类型设定的概算金额阈值
-        List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
-        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
-        //各个类型的概算金额阈值
-        for (SysDictData dictData : data) {
-            //    类型----阈值
-            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
-        //项目类型
-        for (ProjectTypes value : ProjectTypes.values()) {
-            if (yearsStandardVo.getProjectType().equals(value.getCode())) {
-                threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
-            }
-            break;
-        }
-        if (evaluation.compareTo(threshold) == 1) {
-            //是超额项目
-            ofYears.setIsExcess("1");
-        } else {
-            ofYears.setIsExcess("0");
-        }
+        ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
         planYearsMapper.insertPlanYears(ofYears);
@@ -130,43 +109,19 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        BigDecimal evaluation = ofYears.getEvaluation();
-        BigDecimal threshold = new BigDecimal(0);
-        //获取各个项目类型设定的概算金额阈值
-        List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
-        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
-        //各个类型的概算金额阈值
-        for (SysDictData dictData : data) {
-            //    类型----阈值
-            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
-        //项目类型
-        for (ProjectTypes value : ProjectTypes.values()) {
-            if (ofYears.getProjectType().equals(value.getCode())) {
-                threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
-            }
-            break;
-        }
-
-        if (evaluation.compareTo(threshold) == 1) {
-            //是超额项目
-            ofYears.setIsExcess("1");
-        } else {
-            ofYears.setIsExcess("0");
-        }
-
+        ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
+        ofYears.setUpdateTime(new Date());
         planYearsMapper.updateById(ofYears);
         return AjaxResult.success();
     }
 
     @Override
-    public String importPlanYears(List<PlanYears> planYears, boolean isUpdateSupport, String operName) {
+    public String importPlanYears(List<PlanYears> planYears, boolean isUpdateSupport, LoginUser loginUser) {
         if (StringUtils.isNull(planYears) || planYears.size() == 0) {
             throw new ServiceException("导入年度计划数据不能为空!");
         }
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("ProjectTypes");
-        HashMap<String, String> projectStatusMap = planEnums.get("ProjectStatus");
         HashMap<String, String> planPurchaseModesMap = planEnums.get("PlanPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("ProjectAttributes");
         HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
@@ -178,24 +133,32 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             try {
                 //验证项目名称是否重复导入
                 List<PlanYears> plan = planYearsMapper.countProjectName(ofYear.getProjectName());
+
                 if (plan.size() == 0) {
                     //将录入信息中的值更改为要保存的数据
-
+                    ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
+                    ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+                    ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
+                    ofYear.setProjectAtt(projectAttributes.get(ofYear.getProjectAtt()));
+                    ofYear.setPurchaseServices(purchaseServices.get(ofYear.getPurchaseServices()));
+                    ofYear.setCreateBy(String.valueOf(loginUser.getUserId()));
+                    ofYear.setCreateTime(new Date());
+                    //采购单位
                     planYearsMapper.insertPlanYears(ofYear);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 导入成功");
-                } else if (isUpdateSupport) {
-                    PlanYears years = plan.get(0);
-                    BeanValidators.validateWithException(validator, ofYear);
-                    years.setCreateBy(operName);
-                    years.setCreateTime(new Date());
-                    years.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-                    planYearsMapper.updateById(years);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
+                    //} else if (isUpdateSupport) {
+                    //    PlanYears years = plan.get(0);
+                    //    BeanValidators.validateWithException(validator, ofYear);
+                    //    years.setCreateBy(operName);
+                    //    years.setCreateTime(new Date());
+                    //    years.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+                    //    planYearsMapper.updateById(years);
+                    //    successNum++;
+                    //    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 更新成功");
                 } else {
                     failureNum++;
-                    successMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 已存在");
+                    failureMsg.append("<br/>" + successNum + "、项目 " + ofYear.getProjectName() + " 已存在");
                 }
             } catch (Exception exc) {
                 failureNum++;
@@ -269,4 +232,29 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return AjaxResult.success();
     }
 
+    //判断是否为超额计划
+    public String isExcessOrNo(String projectType, BigDecimal evaluation) {
+        BigDecimal threshold = new BigDecimal(0);
+        //获取各个项目类型设定的概算金额阈值
+        List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
+        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
+        //各个类型的概算金额阈值
+        for (SysDictData dictData : data) {
+            //    类型----阈值
+            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
+        }
+        //项目类型
+        for (ProjectTypes value : ProjectTypes.values()) {
+            if (projectType.equals(value.getCode())) {
+                threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
+            }
+            break;
+        }
+        if (evaluation.compareTo(threshold) == 1) {
+            //是超额计划
+            return ("1");
+        } else {
+            return ("0");
+        }
+    }
 }

+ 36 - 33
purchase-system/src/main/resources/mapper/plan/PlanYearsMapper.xml

@@ -6,7 +6,7 @@
 
 	<resultMap type="com.ozs.plan.doman.PlanYears" id="PlanYearsResult">
 		<id property="plan_year_id" column="planYearId"/>
-		<result property="purchase_unit" column="purchaseUnit"/>
+		<result property="purchase_dept_id" column="purchaseDeptId"/>
 		<result property="project_name" column="projectName"/>
 		<result property="project_type" column="projectType"/>
 		<result property="demand_overview" column="demandOverview"/>
@@ -14,36 +14,38 @@
 		<result property="is_excess" column="isExcess"/>
 		<result property="purchase_services" column="purchaseServices"/>
 		<result property="purchase_mode" column="purchaseMode"/>
-		<result property="demand_commit_time" column="demandCommitTime"/>
-		<result property="purchase_finish_time" column="purchaseFinishTime"/>
-		<result property="deliver_time" column="deliverTime"/>
-		<result property="project_attribute" column="projectAttribute"/>
-		<result property="readjust_of_plan" column="readjustOfPlan"/>
+		<result property="plan_demand_sub_time" column="planDemandSubTime"/>
+		<result property="plan_purchase_finish_time" column="planPurchaseFinishTime"/>
+		<result property="plan_deliver_time" column="planDeliverTime"/>
+		<result property="project_attr" column="projectAtt"/>
+		<result property="adjust_reason" column="adjustReason"/>
 		<result property="remarks" column="remarks"/>
 		<result property="project_status" column="projectStatus"/>
-		<result property="create_by" column="createBy"/>
+		<result property="created" column="created"/>
 		<result property="create_time" column="createTime"/>
-		<result property="reason_of_return" column="reasonOfReturn"/>
-		<result property="is_delete" column="isDelete"/>
+		<result property="updated" column="updated"/>
+		<result property="update_time" column="updateTime"/>
+		<result property="refuse_reason" column="refuseReason"/>
+		<result property="del_flay" column="delFlay"/>
 	</resultMap>
 
 	<update id="updateById" parameterType="com.ozs.plan.doman.PlanYears">
 		update plan_years
-		set purchase_unit=#{purchaseUnit},
-			project_name=#{projectName},
+		set project_name=#{projectName},
 			project_type=#{projectType},
 			demand_overview=#{demandOverview},
 			evaluation=#{evaluation},
 			is_excess=#{isExcess},
 			purchase_services=#{purchaseServices},
 			purchase_mode=#{purchaseMode},
-			demand_commit_time=#{demandCommitTime},
-			purchase_finish_time=#{purchaseFinishTime},
-			deliver_time=#{deliverTime},
-			project_attribute=#{projectAttribute},
-			readjust_of_plan=#{readjustOfPlan},
+			plan_demand_sub_time=#{planDemandSubTime},
+			plan_purchase_finish_time=#{planPurchaseFinishTime},
+			plan_deliver_time=#{planDeliverTime},
+			project_attr=#{projectAtt},
+			adjust_reason=#{adjustReason},
 			remarks=#{remarks},
-			project_status=#{projectStatus}
+			updated=#{updated},
+			update_time=#{updateTime}
 		where plan_year_id = #{planYearId}
 	</update>
 
@@ -63,12 +65,12 @@
 				AND project_status = #{projectStatus}
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(demand_commit_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+				and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(demand_commit_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			</if>
-			and is_delete=0
+			and del_flay=0
 		</where>
 		order by create_time desc
 	</select>
@@ -77,14 +79,14 @@
 		select *
 		from plan_years
 		where project_name = #{projectName}
-		  and is_delete = 0
+		  and del_flay = 0
 	</select>
 
 	<select id="getById" resultType="com.ozs.plan.doman.PlanYears" parameterType="java.lang.Long">
 		select *
 		from plan_years
 		where plan_year_id = #{planYearId}
-		  and is_delete = 0
+		  and del_flay = 0
 	</select>
 
 	<select id="countProjectNameOther" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -92,23 +94,24 @@
 		from plan_years
 		where project_name = #{projectName}
 		  and plan_year_id != #{planYearId}
-		  and is_delete = 0
+		  and del_flay = 0
 	</select>
 
 	<!--	创建计划信息-->
 	<insert id="insertPlanYears" parameterType="com.ozs.plan.doman.PlanYears">
-		insert into plan_years (purchase_unit, project_name, project_type, demand_overview, evaluation, is_excess,
-								purchase_services, purchase_mode, demand_commit_time, purchase_finish_time,
-								deliver_time, project_attribute, readjust_of_plan, remarks, project_status,
-								create_by, create_time, is_delete)
-		values (#{purchaseUnit}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation}, #{isExcess},
-				#{purchaseServices}, #{purchaseMode}, #{demandCommitTime}, #{purchaseFinishTime}, #{deliverTime},
-				#{projectAttribute}, #{readjustOfPlan}, #{remarks}, #{projectStatus}, #{createBy}, #{createTime}, 0)
+		insert into plan_years (purchase_dept_id, project_name, project_type, demand_overview, evaluation, is_excess,
+								purchase_services, purchase_mode, plan_demand_sub_time, plan_purchase_finish_time,
+								plan_deliver_time, project_attr, adjust_reason, remarks, project_status,
+								created, create_time, del_flay)
+		values (#{purchaseDeptId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation}, #{isExcess},
+				#{purchaseServices}, #{purchaseMode}, #{planDemandSubTime}, #{planPurchaseFinishTime},
+				#{planDeliverTime},
+				#{projectAtt}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0)
 	</insert>
 
 	<!--	计划删除-->
 	<update id="deletePlanYearsByIds" parameterType="java.lang.Long">
-		update plan_years set is_delete=1 where plan_year_id in
+		update plan_years set del_flay=1 where plan_year_id in
 		<foreach collection="array" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
@@ -116,7 +119,7 @@
 
 	<update id="deletePlanYearsById" parameterType="java.lang.Long">
 		update plan_years
-		set is_delete=1
+		set del_flay=1
 		where plan_year_id = #{plan_year_id}
 	</update>
 
@@ -130,7 +133,7 @@
 	<!--	计划审核-->
 	<update id="review" parameterType="com.ozs.plan.doman.PlanYears">
 		update plan_years
-		set reason_of_return=#{reasonOfReturn},
+		set refuse_reason=#{refuseReason},
 			project_status=#{projectStatus}
 		where plan_year_id = #{planYearId}
 	</update>

+ 25 - 19
purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.pm.mapper.PmDemandMapper">
-    
+
     <resultMap type="com.ozs.pm.doman.PmDemand" id="PmDemandResult">
         <result property="demandId"    column="demand_id"    />
         <result property="planId"    column="plan_id"    />
@@ -42,17 +42,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPmDemandList" parameterType="com.ozs.pm.doman.PmDemand" resultMap="PmDemandResult">
         <include refid="selectPmDemandVo"/>
-        <where>  
-            <if test="planId != null "> and plan_id = #{planId}</if>
-            <if test="purchaseDeptId != null "> and purchase_dept_id = #{purchaseDeptId}</if>
-            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="projectType != null  and projectType != ''"> and project_type = #{projectType}</if>
-            <if test="demandOverview != null  and demandOverview != ''"> and demand_overview = #{demandOverview}</if>
-            <if test="evaluation != null "> and evaluation = #{evaluation}</if>
-            <if test="isExcess != null "> and is_excess = #{isExcess}</if>
-            <if test="purchaseServices != null  and purchaseServices != ''"> and purchase_services = #{purchaseServices}</if>
-            <if test="purchaseMode != null  and purchaseMode != ''"> and purchase_mode = #{purchaseMode}</if>
-            <if test="planDemandSubTime != null "> and plan_demand_sub_time = #{planDemandSubTime}</if>
+        <where>
+            <if test="planId != null ">and plan_id = #{planId}</if>
+            <if test="purchaseDeptId != null ">and purchase_dept_id = #{purchaseDeptId}</if>
+            <if test="projectName != null  and projectName != ''">and project_name like concat('%', #{projectName},
+                '%')
+            </if>
+            <if test="projectType != null  and projectType != ''">and project_type = #{projectType}</if>
+            <if test="demandOverview != null  and demandOverview != ''">and demand_overview = #{demandOverview}</if>
+            <if test="evaluation != null ">and evaluation = #{evaluation}</if>
+            <if test="isExcess != null ">and is_excess = #{isExcess}</if>
+            <if test="purchaseServices != null  and purchaseServices != ''">and purchase_services =
+                #{purchaseServices}
+            </if>
+            <if test="purchaseMode != null  and purchaseMode != ''">and purchase_mode = #{purchaseMode}</if>
+            <if test="planDemandSubTime != null ">and plan_demand_sub_time = #{planDemandSubTime}</if>
             <if test="planPurchaseFinishTime != null "> and plan_purchase_finish_time = #{planPurchaseFinishTime}</if>
             <if test="planDeliverTime != null "> and plan_deliver_time = #{planDeliverTime}</if>
             <if test="projectAttr != null  and projectAttr != ''"> and project_attr = #{projectAttr}</if>
@@ -73,18 +77,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="params.endDate != null  and params.endDate != ''">
                 and
-                (demand_commit_time &lt;= #{params.endDate} or purchase_finish_time &lt;= #{params.endDate} or deliver_time &lt;= #{params.endDate})
+                (demand_commit_time &lt;= #{params.endDate} or purchase_finish_time &lt;= #{params.endDate} or
+                deliver_time &lt;= #{params.endDate})
             </if>
-            <if test="projectFiles != null  and projectFiles != ''"> and project_files = #{projectFiles}</if>
+            <if test="projectFiles != null  and projectFiles != ''">and project_files = #{projectFiles}</if>
         </where>
     </select>
-    
+
     <select id="selectPmDemandByDemandId" parameterType="Long" resultMap="PmDemandResult">
         <include refid="selectPmDemandVo"/>
         where demand_id = #{demandId}
     </select>
-        
-    <insert id="insertPmDemand" parameterType="PmDemand" useGeneratedKeys="true" keyProperty="demandId">
+
+    <insert id="insertPmDemand" parameterType="com.ozs.pm.doman.PmDemand" useGeneratedKeys="true"
+            keyProperty="demandId">
         insert into pm_demand
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="planId != null">plan_id,</if>
@@ -148,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updatePmDemand" parameterType="PmDemand">
+    <update id="updatePmDemand" parameterType="com.ozs.pm.doman.PmDemand">
         update pm_demand
         <trim prefix="SET" suffixOverrides=",">
             <if test="planId != null">plan_id = #{planId},</if>
@@ -183,4 +189,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where demand_id = #{demandId}
     </update>
 
-</mapper>
+</mapper>