1.0.46 合同信息添加字段

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java

@@ -212,4 +212,19 @@ public class ErpContractInfo extends TenantEntity {
     @TableField(exist = false)
     private String deptName;
 
+    /**
+     * 合同负责人
+     */
+    private Long contractManagerId;
+
+    /**
+     * 合同大写金额
+     */
+    private String capitalizedAmount;
+
+    /**
+     * 合同模板标识（1客户 2内部）
+     */
+    private String contractTemplateFlag;
+
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java

@@ -204,6 +204,21 @@ public class ErpContractInfoBo extends BaseEntity {
      */
     private String deptName;
 
+    /**
+     * 合同负责人
+     */
+    private Long contractManagerId;
+
+    /**
+     * 合同大写金额
+     */
+    private String capitalizedAmount;
+
+    /**
+     * 合同模板标识（1客户 2内部）
+     */
+    private String contractTemplateFlag;
+
     /**
      * 流程定义编码
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java

@@ -247,4 +247,29 @@ public class ErpContractInfoVo implements Serializable {
      */
     private String deptName;
 
+    /**
+     * 合同负责人
+     */
+    @ExcelProperty(value = "合同负责人")
+    private Long contractManagerId;
+
+    /**
+     * 合同负责人名称
+     */
+    @ExcelProperty(value = "合同负责人名称")
+    private String contractManagerName;
+
+    /**
+     * 合同大写金额
+     */
+    @ExcelProperty(value = "合同大写金额")
+    private String capitalizedAmount;
+
+    /**
+     * 合同模板标识（1客户 2内部）
+     */
+    @ExcelProperty(value = "合同模板标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "contract_template_flag")
+    private String contractTemplateFlag;
+
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java

@@ -119,6 +119,9 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
             .eq(bo.getSignatureAppendix() != null, ErpContractInfo::getSignatureAppendix, bo.getSignatureAppendix())
             .eq(bo.getTaxRate() != null, ErpContractInfo::getTaxRate, bo.getTaxRate())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag())
+            .eq(bo.getContractManagerId() != null, ErpContractInfo::getContractManagerId, bo.getContractManagerId())
+            .eq(StringUtils.isNotBlank(bo.getCapitalizedAmount()), ErpContractInfo::getCapitalizedAmount, bo.getCapitalizedAmount())
+            .eq(StringUtils.isNotBlank(bo.getContractTemplateFlag()), ErpContractInfo::getContractTemplateFlag, bo.getContractTemplateFlag())
             .eq("t.del_flag", "0")
             .orderByDesc(ErpContractInfo::getCreateTime);
         return lqw;

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml

@@ -39,6 +39,9 @@
                t.tax_rate,
                t.remark,
                t.active_flag,
+               t.contract_manager_id,
+               t.capitalized_amount,
+               t.contract_template_flag,
                t.del_flag,
                t.create_dept,
                t.create_by,
@@ -47,11 +50,13 @@
                t.update_time,
                c1.customer_name oneCustomerName,
                c2.customer_name twoCustomerName,
-               d.dept_name
+               d.dept_name,
+               u.nick_name contractManagerName
         from erp_contract_info t
                  left join crm_customer_info c1 on t.one_customer_id = c1.customer_id
                  left join crm_customer_info c2 on t.two_customer_id = c2.customer_id
                  left join sys_dept d on d.dept_id = t.contract_dept_id
+                 left join sys_user u on u.user_id = t.contract_manager_id
             ${ew.getCustomSqlSegment}
     </select>