Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <!--    <property name="log.path" value="/home/purchase/logs"/>-->
-    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs"/>
+        <property name="log.path" value="/home/purchase/logs"/>
+<!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs"/>-->
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 

purchase-system/src/main/java/com/ozs/plan/doman/MonthlyReconciliation.java

@@ -85,10 +85,12 @@ public class MonthlyReconciliation extends BaseEntity
 
     /** 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月） */
     @Excel(name = "计划提报需求时间--->需求单位成功提报采购需求的日期", readConverterExp = "具=体到月")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planDemandSubTime;
 
     /** 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月） */
     @Excel(name = "计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期", readConverterExp = "具=体到月")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planPurchaseFinishTime;
 
     /** 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 */
@@ -110,14 +112,17 @@ public class MonthlyReconciliation extends BaseEntity
 
     /** 实际提报需求时间--->需求单位成功提报采购需求的日期（具体到日） */
     @Excel(name = "实际提报需求时间--->需求单位成功提报采购需求的日期", readConverterExp = "具=体到日")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date realDemandCommitTime;
 
     /** 实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到日） */
     @Excel(name = "实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期", readConverterExp = "具=体到日")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date realPurchaseFinishTime;
 
     /** 实际交付（实施）时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 */
     @Excel(name = "实际交付", readConverterExp = "实=施")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date realDeliverTime;
 
     /** 审核时间 */

purchase-system/src/main/java/com/ozs/plan/doman/PlanQuarter.java

@@ -37,7 +37,7 @@ public class PlanQuarter {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    private Long purchaseDeptId;
+    private String purchaseDeptId;
 
     @Excel(name = "采购单位")
     @TableField(exist = false)

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

@@ -29,7 +29,7 @@ public class PlanYears {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    private Long purchaseDeptId;
+    private String purchaseDeptId;
 
     @Excel(name = "采购单位")
     @TableField(exist = false)

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -325,7 +325,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(info.getDeptId());
+                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");

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

@@ -94,9 +94,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
-            if (!ObjectUtils.isEmpty(vo.getPurchaseDeptId())) {
-                ofYears.setPurchaseDeptId(Long.valueOf(vo.getPurchaseDeptId()));
-            }
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
             planYearsList = changeTo(planYears);
         } catch (Exception e) {
@@ -153,7 +150,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
-            ofYears.setPurchaseDeptId(Long.valueOf(vo.getPurchaseDeptId()));
             planYears = planYearsMapper.selectPlanYearsExamineList(ofYears);
             planYearsList = changeTo(planYears);
         } catch (Exception e) {
@@ -214,7 +210,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
-            ofYears.setPurchaseDeptId(Long.valueOf(yearsStandardVo.getPurchaseDeptId()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -287,7 +282,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
-            ofYears.setPurchaseDeptId(Long.valueOf(yearsStandardVo.getPurchaseDeptId()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -345,7 +339,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(info.getDeptId());
+                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");