Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/system/SysProcurementStandardController.java

@@ -59,13 +59,9 @@ public class SysProcurementStandardController {
     public R<String> update(@RequestBody List<SysProcurementStandardVo> sysProcurementStandardVoList) {
         boolean isSuccess = false;
         SysProcurementStandard sysProcurementStandard = new SysProcurementStandard();
-        LambdaQueryWrapper<SysProcurementStandard> lw = new LambdaQueryWrapper<>();
         for (SysProcurementStandardVo sysProcurementStandardVo : sysProcurementStandardVoList) {
             BeanUtils.copyProperties(sysProcurementStandardVo, sysProcurementStandard);
-            if(sysProcurementStandard.getProcurementStandardId()>-1L){
-                lw.eq(SysProcurementStandard::getProcurementStandardId,sysProcurementStandard.getProcurementStandardId());
-            }
-            isSuccess = sysProcurementStandardService.update(sysProcurementStandard,lw);
+            isSuccess = sysProcurementStandardService.updateById(sysProcurementStandard);
             if (!isSuccess) {
                 return R.fail();
             }

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

@@ -34,13 +34,13 @@ public class SysDept extends BaseEntity
     /** 显示顺序 */
     private Integer orderNum;
 
-    /** 负责人 */
+    /** 法定代表人 */
     private String leader;
 
     /** 联系电话 */
     private String phone;
 
-    /** 邮箱 */
+    /** 邮政编码 */
     private String email;
 
     /** 部门状态:0正常,1停用 */
@@ -62,6 +62,54 @@ public class SysDept extends BaseEntity
      * 地址
      */
     private String address;
+    /**
+     * 项目联系人
+     */
+    private String projectContact;
+    /**
+     * 银行账户名称
+     */
+    private String bankAccountName;
+    /**
+     * 开户银行
+     */
+    private String bankOfDeposit;
+    /**
+     * 账号
+     */
+    private String accountNumber;
+
+    public String getProjectContact() {
+        return projectContact;
+    }
+
+    public void setProjectContact(String projectContact) {
+        this.projectContact = projectContact;
+    }
+
+    public String getBankAccountName() {
+        return bankAccountName;
+    }
+
+    public void setBankAccountName(String bankAccountName) {
+        this.bankAccountName = bankAccountName;
+    }
+
+    public String getBankOfDeposit() {
+        return bankOfDeposit;
+    }
+
+    public void setBankOfDeposit(String bankOfDeposit) {
+        this.bankOfDeposit = bankOfDeposit;
+    }
+
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber;
+    }
 
     public String getRemarks() {
         return remarks;
@@ -224,6 +272,10 @@ public class SysDept extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remarks",getRemarks())
             .append("address",getAddress())
+            .append("projectContact", getProjectContact())
+            .append("bankAccountName", getBankAccountName())
+            .append("bankOfDeposit", getBankOfDeposit())
+            .append("accountNumber", getAccountNumber())
             .toString();
     }
 }

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

@@ -21,6 +21,7 @@ public class SysProcurementStandard implements Serializable {
     
     @ApiModelProperty(value = "采购标准ID")
     @TableField("procurement_standard_id")
+    @TableId(type = IdType.AUTO)
     private Long procurementStandardId;
     
     @ApiModelProperty(value = "部门ID")

purchase-system/src/main/java/com/ozs/system/domain/vo/responseVo/SysDeptResponseVo.java

@@ -43,4 +43,24 @@ public class SysDeptResponseVo implements Serializable {
      * 地址
      */
     private String address;
+    /**
+     * 项目联系人
+     */
+    private String projectContact;
+    /**
+     * 银行账户名称
+     */
+    private String bankAccountName;
+    /**
+     * 开户银行
+     */
+    private String bankOfDeposit;
+    /**
+     * 账号
+     */
+    private String accountNumber;
+    /** 法定代表人 */
+    private String leader;
+    /** 邮政编码 */
+    private String email;
 }

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

@@ -23,7 +23,8 @@
     </resultMap>
 
     <sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.remarks
+        ,d.address,d.project_contact,d.bank_account_name,d.bank_of_deposit,d.account_number
         from sys_dept d
     </sql>
 
@@ -60,7 +61,8 @@
     </select>
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.remarks,d.address,
+		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.remarks,d.address
+		,d.project_contact,d.bank_account_name,d.bank_of_deposit,d.account_number,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
@@ -110,6 +112,10 @@
         <if test="email != null and email != ''">email,</if>
         <if test="address != null and address != ''">address,</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>
+        <if test="bankOfDeposit != null and bankOfDeposit != ''">bank_of_deposit,</if>
+        <if test="accountNumber != null and accountNumber != ''">account_number,</if>
         <if test="status != null">status,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
@@ -124,6 +130,10 @@
         <if test="email != null and email != ''">#{email},</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>
+        <if test="bankAccountName != null and bankAccountName != ''">#{bankAccountName},</if>
+        <if test="bankOfDeposit != null and bankOfDeposit != ''">#{bankOfDeposit},</if>
+        <if test="accountNumber != null and accountNumber != ''">#{accountNumber},</if>
         <if test="status != null">#{status},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
@@ -138,6 +148,10 @@
             <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="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>
+            <if test="accountNumber != null and accountNumber != ''">account_number = #{accountNumber},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="leader != null">leader = #{leader},</if>
             <if test="phone != null">phone = #{phone},</if>