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

purchase-admin/src/main/java/com/ozs/web/controller/plan/MonthlyReconciliationController.java

@@ -86,7 +86,7 @@ public class MonthlyReconciliationController extends BaseController {
                 List<SysDictData> projectStatus = dictTypeService.selectDictDataByType(Constants.SYS_PROJECT_STATUS);
                 if (!ObjectUtils.isEmpty(projectStatus)) {
                     List<SysDictData> collect = projectStatus.stream()
-                            .filter(d -> d.getDictValue().equals(dto.getProjectStatus())).collect(Collectors.toList());
+                            .filter(d -> d.getDictValue().equals(dto.getProjectStatus().toString())).collect(Collectors.toList());
                     if (!ObjectUtils.isEmpty(collect)) {
                         dto.setProjectStatusStr(collect.get(0).getDictLabel());
                     }

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -6,6 +6,9 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.core.domain.BaseEntity;
@@ -78,6 +81,10 @@ public class SysDept extends BaseEntity
      * 账号
      */
     private String accountNumber;
+    /**
+     * 采购服务站名称
+     */
+    private String  purchaseServices;
 
     public String getProjectContact() {
         return projectContact;
@@ -253,6 +260,14 @@ public class SysDept extends BaseEntity
         this.children = children;
     }
 
+    public String getPurchaseServices() {
+        return purchaseServices;
+    }
+
+    public void setPurchaseServices(String purchaseServices) {
+        this.purchaseServices = purchaseServices;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -276,6 +291,7 @@ public class SysDept extends BaseEntity
             .append("bankAccountName", getBankAccountName())
             .append("bankOfDeposit", getBankOfDeposit())
             .append("accountNumber", getAccountNumber())
+            .append("purchaseServices",getPurchaseServices())    
             .toString();
     }
 }

purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -111,6 +111,7 @@
         <if test="phone != null and phone != ''">phone,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="address != null and address != ''">address,</if>
+        <if test="purchaseServices != null and purchaseServices != ''">purchase_services,</if>
         <if test="remarks != null and remarks != ''">remarks,</if>
         <if test="projectContact != null and projectContact != ''">project_contact,</if>
         <if test="bankAccountName != null and bankAccountName != ''">bank_account_name,</if>
@@ -128,6 +129,7 @@
         <if test="leader != null and leader != ''">#{leader},</if>
         <if test="phone != null and phone != ''">#{phone},</if>
         <if test="email != null and email != ''">#{email},</if>
+        <if test="purchaseServices != null and purchaseServices != ''">#{purchaseServices},</if>
         <if test="address != null and address != ''">#{address},</if>
         <if test="remarks != null and remarks != ''">#{remarks},</if>
         <if test="projectContact != null and projectContact != ''">#{projectContact},</if>
@@ -148,6 +150,7 @@
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="remarks != null and remarks != ''">remarks = #{remarks},</if>
+            <if test="purchaseServices != null and purchaseServices != ''">purchase_services = #{purchaseServices},</if>
             <if test="projectContact != null and projectContact != ''">project_contact = #{projectContact},</if>
             <if test="bankAccountName != null and bankAccountName != ''">bank_account_name = #{bankAccountName},</if>
             <if test="bankOfDeposit != null and bankOfDeposit != ''">bank_of_deposit = #{bankOfDeposit},</if>