朱园亮 / xingyun-erp · Commits

Commit 123889009f8ab1c81960c5300d240a6d95cf92f7

Authored by 房远帅
1 parent 83066203

账期：资金协调手续-主表

Inline Side-by-side
Showing 11 changed files with 224 additions and 19 deletions
... ... @@ -993,3 +993,45 @@ CREATE TABLE `unlimited_guarantee_letter`(
993 993 `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
994 994 PRIMARY KEY (`id`)
995 995 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='无限担保书明细表'
  996 +
  997 +CREATE TABLE `fund_coordination` (
  998 + `id` varchar(32) NOT NULL COMMENT 'ID',
  999 + `applicant` varchar(32) DEFAULT NULL COMMENT '申请人',
  1000 + `fund_responsible_person` varchar(32) DEFAULT NULL COMMENT '资金清收责任人',
  1001 + `dept_and_role` varchar(100) DEFAULT NULL COMMENT '资金清收责任人部门和角色',
  1002 + `application_date` date DEFAULT NULL COMMENT '申请日期',
  1003 + `ordering_unit_name` text DEFAULT NULL COMMENT '订货单位',
  1004 + `customer_short_id` varchar(32) DEFAULT NULL COMMENT '客户简称ID',
  1005 + `customer_type` varchar(50) DEFAULT NULL COMMENT '客户类型',
  1006 + `unlimited_guarantee_letter` varchar(500) DEFAULT NULL COMMENT '无限担保书',
  1007 + `settlement_period` varchar(100) DEFAULT NULL COMMENT '结算期限',
  1008 + `credit_limit` varchar(100) DEFAULT NULL COMMENT '授权额度',
  1009 + `order_date` date DEFAULT NULL COMMENT '订货日期',
  1010 + `order_quantity` decimal(15,4) DEFAULT NULL COMMENT '订货数量',
  1011 + `requirement_specification` text DEFAULT NULL COMMENT '协调事由需求说明',
  1012 + `office_clerk` varchar(32) DEFAULT NULL COMMENT '办事处内勤ID',
  1013 + `office_clerk_opinion` text DEFAULT NULL COMMENT '办事处内勤审核意见',
  1014 + `office_supervisor` varchar(32) DEFAULT NULL COMMENT '办事处主管ID',
  1015 + `office_supervisor_opinion` text DEFAULT NULL COMMENT '办事处主管审核意见',
  1016 + `marketing_deputy_director` varchar(32) DEFAULT NULL COMMENT '营销部分管ID',
  1017 + `marketing_deputy_director_opinion` text DEFAULT NULL COMMENT '营销部分管审核意见',
  1018 + `fund_management_operation_department` varchar(32) DEFAULT NULL COMMENT '运作科资金管理岗ID',
  1019 + `fund_management_operation_department_opinion` text DEFAULT NULL COMMENT '运作科资金管理岗审核意见',
  1020 + `operations_department_supervisor` varchar(32) DEFAULT NULL COMMENT '运作科主管ID',
  1021 + `operations_department_supervisor_opinion` text DEFAULT NULL COMMENT '运作科主管审核意见',
  1022 + `marketing_department_manager` varchar(32) DEFAULT NULL COMMENT '营销部主管ID',
  1023 + `marketing_department_manager_opinion` text DEFAULT NULL COMMENT '营销部主管审核意见',
  1024 + `finance_department` varchar(32) DEFAULT NULL COMMENT '财务部副经理ID',
  1025 + `finance_department_opinion` text DEFAULT NULL COMMENT '财务部副经理审核意见',
  1026 + `marketing_center_supervisor` varchar(32) DEFAULT NULL COMMENT '营销中心主管ID',
  1027 + `marketing_center_supervisor_opinion` text DEFAULT NULL COMMENT '营销中心主管审核意见',
  1028 + `general_manager` varchar(32) DEFAULT NULL COMMENT '总经理ID',
  1029 + `general_manager_opinion` text DEFAULT NULL COMMENT '总经理审核意见',
  1030 + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
  1031 + `create_by` varchar(20) NOT NULL COMMENT '创建人',
  1032 + `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',
  1033 + `update_by` varchar(20) NOT NULL COMMENT '更新人',
  1034 + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  1035 + `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
  1036 + PRIMARY KEY (`id`)
  1037 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='资金协调手续'
... ...
... ... @@ -32,6 +32,12 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
32 32 private String applicant;
33 33
34 34 /**
  35 + * 申请人姓名
  36 + */
  37 + @ApiModelProperty("申请人姓名")
  38 + private String applicantName;
  39 +
  40 + /**
35 41 * 资金清收责任人
36 42 */
37 43 @ApiModelProperty("资金清收责任人")
... ... @@ -48,16 +54,22 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
48 54 private LocalDate applicationDate;
49 55
50 56 /**
51   - * 订货单位
  57 + * 订货单位名称
52 58 */
53   - @ApiModelProperty("订货单位")
54   - private String orderingUnit;
  59 + @ApiModelProperty("订货单位名称")
  60 + private String orderingUnitName;
55 61
56 62 /**
57 63 * 客户简称ID
58 64 */
59 65 @ApiModelProperty("客户简称ID")
60   - private String shortCustomerId;
  66 + private String customerShortId;
  67 +
  68 + /**
  69 + * 客户简称名称
  70 + */
  71 + @ApiModelProperty("客户简称名称")
  72 + private String customerShortName;
61 73
62 74 /**
63 75 * 客户类型
... ... @@ -66,6 +78,12 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
66 78 private String customerType;
67 79
68 80 /**
  81 + * 客户类型名称
  82 + */
  83 + @ApiModelProperty("客户类型名称")
  84 + private String customerTypeName;
  85 +
  86 + /**
69 87 * 无限担保书
70 88 */
71 89 @ApiModelProperty("无限担保书")
... ...
... ... @@ -32,6 +32,12 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
32 32 private String applicant;
33 33
34 34 /**
  35 + * 申请人姓名
  36 + */
  37 + @ApiModelProperty("申请人姓名")
  38 + private String applicantName;
  39 +
  40 + /**
35 41 * 资金清收责任人
36 42 */
37 43 @ApiModelProperty("资金清收责任人")
... ... @@ -48,16 +54,16 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
48 54 private LocalDate applicationDate;
49 55
50 56 /**
51   - * 订货单位
  57 + * 订货单位名称
52 58 */
53   - @ApiModelProperty("订货单位")
54   - private String orderingUnit;
  59 + @ApiModelProperty("订货单位名称")
  60 + private String orderingUnitName;
55 61
56 62 /**
57 63 * 客户简称ID
58 64 */
59 65 @ApiModelProperty("客户简称ID")
60   - private String shortCustomerId;
  66 + private String customerShortId;
61 67
62 68 /**
63 69 * 客户类型
... ... @@ -66,6 +72,12 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
66 72 private String customerType;
67 73
68 74 /**
  75 + * 客户简称名称
  76 + */
  77 + @ApiModelProperty("客户简称名称")
  78 + private String customerShortName;
  79 +
  80 + /**
69 81 * 无限担保书
70 82 */
71 83 @ApiModelProperty("无限担保书")
... ...
... ... @@ -58,7 +58,7 @@ public class FundCoordination extends BaseEntity implements BaseDto {
58 58 /**
59 59 * 订货单位
60 60 */
61   - private String orderingUnit;
  61 + private String orderingUnitName;
62 62
63 63 /**
64 64 * 客户简称ID
... ... @@ -107,6 +107,96 @@ public class FundCoordination extends BaseEntity implements BaseDto {
107 107 private String requirementSpecification;
108 108
109 109 /**
  110 + * 办事处内勤ID
  111 + */
  112 + private String officeClerk;
  113 +
  114 + /**
  115 + * 办事处内勤审核意见
  116 + */
  117 + private String officeClerkOpinion;
  118 +
  119 + /**
  120 + * 办事处主管ID
  121 + */
  122 + private String officeSupervisor;
  123 +
  124 + /**
  125 + * 办事处主管审核意见
  126 + */
  127 + private String officeSupervisorOpinion;
  128 +
  129 + /**
  130 + * 营销部分管ID
  131 + */
  132 + private String marketingDeputyDirector;
  133 +
  134 + /**
  135 + * 营销部分管审核意见
  136 + */
  137 + private String marketingDeputyDirectorOpinion;
  138 +
  139 + /**
  140 + * 运作科资金管理岗ID
  141 + */
  142 + private String fundManagementOperationDepartment;
  143 +
  144 + /**
  145 + * 运作科资金管理岗审核意见
  146 + */
  147 + private String fundManagementOperationDepartmentOpinion;
  148 +
  149 + /**
  150 + * 运作科主管ID
  151 + */
  152 + private String operationsDepartmentSupervisor;
  153 +
  154 + /**
  155 + * 运作科主管审核意见
  156 + */
  157 + private String operationsDepartmentSupervisorOpinion;
  158 +
  159 + /**
  160 + * 营销部主管ID
  161 + */
  162 + private String marketingDepartmentManager;
  163 +
  164 + /**
  165 + * 营销部主管审核意见
  166 + */
  167 + private String marketingDepartmentManagerOpinion;
  168 +
  169 + /**
  170 + * 财务部ID
  171 + */
  172 + private String financeDepartment;
  173 +
  174 + /**
  175 + * 财务部副经理审核意见
  176 + */
  177 + private String financeDepartmentOpinion;
  178 +
  179 + /**
  180 + * 营销中心主管ID
  181 + */
  182 + private String marketingCenterSupervisor;
  183 +
  184 + /**
  185 + * 营销中心主管审核意见
  186 + */
  187 + private String marketingCenterSupervisorOpinion;
  188 +
  189 + /**
  190 + * 总经理ID
  191 + */
  192 + private String generalManager;
  193 +
  194 + /**
  195 + * 总经理审核意见
  196 + */
  197 + private String generalManagerOpinion;
  198 +
  199 + /**
110 200 * 创建人ID
111 201 */
112 202 @TableField(fill = FieldFill.INSERT)
... ...
... ... @@ -69,8 +69,8 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
69 69 data.setDeptAndRole(vo.getDeptAndRole());
70 70 }
71 71 data.setApplicationDate(vo.getApplicationDate());
72   - if (!StringUtil.isBlank(vo.getOrderingUnit())) {
73   - data.setOrderingUnit(vo.getOrderingUnit());
  72 + if (!StringUtil.isBlank(vo.getOrderingUnitName())) {
  73 + data.setOrderingUnitName(vo.getOrderingUnitName());
74 74 }
75 75 data.setCustomerShortId(vo.getCustomerShortId());
76 76 if (!StringUtil.isBlank(vo.getCustomerType())) {
... ... @@ -116,7 +116,7 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
116 116 LambdaUpdateWrapper<FundCoordination> updateWrapper = Wrappers.lambdaUpdate(FundCoordination.class)
117 117 .set(FundCoordination::getFundResponsiblePerson, StringUtil.isBlank(vo.getFundResponsiblePerson()) ? null : vo.getFundResponsiblePerson())
118 118 .set(FundCoordination::getDeptAndRole, StringUtil.isBlank(vo.getDeptAndRole()) ? null : vo.getDeptAndRole())
119   - .set(FundCoordination::getOrderingUnit, StringUtil.isBlank(vo.getOrderingUnit()) ? null : vo.getOrderingUnit())
  119 + .set(FundCoordination::getOrderingUnitName, StringUtil.isBlank(vo.getOrderingUnitName()) ? null : vo.getOrderingUnitName())
120 120 .set(FundCoordination::getCustomerShortId, vo.getCustomerShortId())
121 121 .set(FundCoordination::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())
122 122 .set(FundCoordination::getUnlimitedGuaranteeLetter, StringUtil.isBlank(vo.getUnlimitedGuaranteeLetter()) ? null : vo.getUnlimitedGuaranteeLetter())
... ...
... ... @@ -48,7 +48,7 @@ public class CreateFundCoordinationVo implements BaseVo, Serializable {
48 48 */
49 49 @ApiModelProperty("订货单位")
50 50 @Length(message = "订货单位最多允许65,535个字符！")
51   - private String orderingUnit;
  51 + private String orderingUnitName;
52 52
53 53 /**
54 54 * 客户简称ID
... ...
... ... @@ -31,7 +31,7 @@ public class QueryFundCoordinationVo extends PageVo implements BaseVo, Serializa
31 31 * 订货单位
32 32 */
33 33 @ApiModelProperty("订货单位")
34   - private String orderingUnit;
  34 + private String orderingUnitName;
35 35
36 36 /**
37 37 * 客户简称
... ...
... ... @@ -38,7 +38,7 @@ public class UpdateFundCoordinationVo implements BaseVo, Serializable {
38 38 */
39 39 @ApiModelProperty("订货单位")
40 40 @Length(message = "订货单位最多允许65,535个字符！")
41   - private String orderingUnit;
  41 + private String orderingUnitName;
42 42
43 43 /**
44 44 * 客户简称ID
... ...
... ... @@ -72,4 +72,8 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
72 72 */
73 73 @ApiModelProperty("年份")
74 74 private Integer createYear;
  75 +
  76 + @ApiModelProperty("是否需要查询期末应收大于0")
  77 + private boolean includeEndAccountReceivable;
  78 +
75 79 }
... ...
... ... @@ -9,7 +9,7 @@
9 9 <result column="fund_responsible_person" property="fundResponsiblePerson"/>
10 10 <result column="dept_and_role" property="deptAndRole"/>
11 11 <result column="application_date" property="applicationDate"/>
12   - <result column="ordering_unit" property="orderingUnit"/>
  12 + <result column="ordering_unit_name" property="orderingUnitName"/>
13 13 <result column="customer_short_id" property="customerShortId"/>
14 14 <result column="customer_short_name" property="customerShortName"/>
15 15 <result column="customer_type" property="customerType"/>
... ... @@ -19,6 +19,24 @@
19 19 <result column="order_date" property="orderDate"/>
20 20 <result column="order_quantity" property="orderQuantity"/>
21 21 <result column="requirement_specification" property="requirementSpecification"/>
  22 + <result column="office_clerk" property="officeClerk"/>
  23 + <result column="office_clerk_opinion" property="officeClerkOpinion"/>
  24 + <result column="office_supervisor" property="officeSupervisor"/>
  25 + <result column="office_supervisor_opinion" property="officeSupervisorOpinion"/>
  26 + <result column="marketing_deputy_director" property="marketingDeputyDirector"/>
  27 + <result column="marketing_deputy_director_opinion" property="marketingDeputyDirectorOpinion"/>
  28 + <result column="fund_management_operation_department" property="fundManagementOperationDepartment"/>
  29 + <result column="fund_management_operation_department_opinion" property="fundManagementOperationDepartmentOpinion"/>
  30 + <result column="operations_department_supervisor" property="operationsDepartmentSupervisor"/>
  31 + <result column="operations_department_supervisor_opinion" property="operationsDepartmentSupervisorOpinion"/>
  32 + <result column="marketing_department_manager" property="marketingDepartmentManager"/>
  33 + <result column="marketing_department_manager_opinion" property="marketingDepartmentManagerOpinion"/>
  34 + <result column="finance_department" property="financeDepartment"/>
  35 + <result column="finance_department_opinion" property="financeDepartmentOpinion"/>
  36 + <result column="marketing_center_supervisor" property="marketingCenterSupervisor"/>
  37 + <result column="marketing_center_supervisor_opinion" property="marketingCenterSupervisorOpinion"/>
  38 + <result column="general_manager" property="generalManager"/>
  39 + <result column="general_manager_opinion" property="generalManagerOpinion"/>
22 40 <result column="create_by_id" property="createById"/>
23 41 <result column="create_by" property="createBy"/>
24 42 <result column="update_by_id" property="updateById"/>
... ... @@ -35,7 +53,7 @@
35 53 tb.fund_responsible_person,
36 54 tb.dept_and_role,
37 55 tb.application_date,
38   - tb.ordering_unit,
  56 + tb.ordering_unit_name,
39 57 tb.customer_short_id,
40 58 cs.short_name AS customer_short_name,
41 59 tb.customer_type,
... ... @@ -45,6 +63,24 @@
45 63 tb.order_date,
46 64 tb.order_quantity,
47 65 tb.requirement_specification,
  66 + tb.office_clerk,
  67 + tb.office_clerk_opinion,
  68 + tb.office_supervisor,
  69 + tb.office_supervisor_opinion,
  70 + tb.marketing_deputy_director,
  71 + tb.marketing_deputy_director_opinion,
  72 + tb.fund_management_operation_department,
  73 + tb.fund_management_operation_department_opinion,
  74 + tb.operations_department_supervisor,
  75 + tb.operations_department_supervisor_opinion,
  76 + tb.marketing_department_manager,
  77 + tb.marketing_department_manager_opinion,
  78 + tb.finance_department,
  79 + tb.finance_department_opinion,
  80 + tb.marketing_center_supervisor,
  81 + tb.marketing_center_supervisor_opinion,
  82 + tb.general_manager,
  83 + tb.general_manager_opinion,
48 84 tb.create_by_id,
49 85 tb.create_by,
50 86 tb.update_by_id,
... ... @@ -67,8 +103,8 @@
67 103 AND tb.application_date <= #{vo.applicationDateEnd}
68 104 ]]>
69 105 </if>
70   - <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
71   - AND tb.ordering_unit LIKE CONCAT('%', #{vo.orderingUnit})
  106 + <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
  107 + AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
72 108 </if>
73 109 <if test="vo.shortName != null and vo.shortName != ''">
74 110 AND cs.short_name LIKE CONCAT('%', #{vo.shortName}, '%')
... ...
... ... @@ -120,6 +120,9 @@
120 120 <if test="vo.deptName != null and vo.deptName != ''">
121 121 AND d.name LIKE CONCAT('%', #{vo.deptName}, '%')
122 122 </if>
  123 + <if test="vo.includeEndAccountReceivable == true">
  124 + AND d.end_account_receivable >0
  125 + </if>
123 126 </where>
124 127 </select>
125 128
... ...