Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq

@@ -619,6 +619,7 @@ CREATE TABLE IF NOT EXISTS order_info_change_record (
     `examine_status` varchar(50) DEFAULT NULL COMMENT '审核状态',
     `order_id` varchar(32) NOT NULL COMMENT '订货单ID',
     `output` bool DEFAULT NULL comment '已产出',
+    `change_description` text DEFAULT NULL COMMENT '变更说明';
     PRIMARY KEY (`id`),
     KEY `idx_ordering_unit` (`ordering_unit`),
     KEY `idx_order_no` (`order_no`),

@@ -37,6 +37,9 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("资金清收责任人")
     private String fundResponsiblePerson;
 
+    @ApiModelProperty("资金清收责任人的部门和角色")
+    private String deptAndRole;
+
     /**
      * 申请日期
      */

@@ -37,6 +37,9 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("资金清收责任人")
     private String fundResponsiblePerson;
 
+    @ApiModelProperty("资金清收责任人的部门和角色")
+    private String deptAndRole;
+
     /**
      * 申请日期
      */

 package com.lframework.xingyun.sc.controller.ledger;
 
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserService;
+import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
 import com.lframework.xingyun.sc.bo.ledger.fund.GetFundCoordinationBo;
 import com.lframework.xingyun.sc.bo.ledger.fund.QueryFundCoordinationBo;
 import com.lframework.xingyun.sc.entity.FundCoordination;
@@ -39,6 +47,10 @@ public class FundCoordinationController extends DefaultBaseController {
 
     @Autowired
     private FundCoordinationService fundCoordinationService;
+    @Resource
+    private SysDeptService sysDeptService;
+    @Resource
+    private SysUserService sysUserService;
 
     /**
      * 查询列表
@@ -118,4 +130,21 @@ public class FundCoordinationController extends DefaultBaseController {
 
         return InvokeResultBuilder.success();
     }
+
+    @ApiOperation("查询人员列表")
+    @GetMapping("/getFundResponsiblePersonList")
+    public InvokeResult<List<QuerySysUserBo>> getFundResponsiblePersonList() {
+        List<QuerySysUserBo> results = null;
+        String userId = SecurityUtil.getCurrentUser().getId();
+        SysDept dept = sysDeptService.getDept(userId);
+        if (dept != null) {
+            QuerySysUserVo vo = new QuerySysUserVo();
+            vo.setDeptCode(dept.getCode());
+            List<SysUser> datas = sysUserService.query(vo);
+            if (!CollectionUtil.isEmpty(datas)) {
+                results = datas.stream().map(QuerySysUserBo::new).collect(Collectors.toList());
+            }
+        }
+        return InvokeResultBuilder.success(results);
+    }
 }

@@ -46,6 +46,11 @@ public class FundCoordination extends BaseEntity implements BaseDto {
     private String fundResponsiblePerson;
 
     /**
+     * 资金清收责任人的部门和角色
+     */
+    private String deptAndRole;
+
+    /**
      * 申请日期
      */
     private LocalDate applicationDate;

@@ -65,6 +65,9 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
         if (!StringUtil.isBlank(vo.getFundResponsiblePerson())) {
             data.setFundResponsiblePerson(vo.getFundResponsiblePerson());
         }
+        if (!StringUtil.isBlank(vo.getDeptAndRole())) {
+            data.setDeptAndRole(vo.getDeptAndRole());
+        }
         data.setApplicationDate(vo.getApplicationDate());
         if (!StringUtil.isBlank(vo.getOrderingUnit())) {
             data.setOrderingUnit(vo.getOrderingUnit());
@@ -112,6 +115,7 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
 
         LambdaUpdateWrapper<FundCoordination> updateWrapper = Wrappers.lambdaUpdate(FundCoordination.class)
                 .set(FundCoordination::getFundResponsiblePerson, StringUtil.isBlank(vo.getFundResponsiblePerson()) ? null : vo.getFundResponsiblePerson())
+                .set(FundCoordination::getDeptAndRole, StringUtil.isBlank(vo.getDeptAndRole()) ? null : vo.getDeptAndRole())
                 .set(FundCoordination::getOrderingUnit, StringUtil.isBlank(vo.getOrderingUnit()) ? null : vo.getOrderingUnit())
                 .set(FundCoordination::getCustomerShortId, vo.getCustomerShortId())
                 .set(FundCoordination::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())

@@ -32,6 +32,9 @@ public class CreateFundCoordinationVo implements BaseVo, Serializable {
     @Length(message = "资金清收责任人最多允许32个字符！")
     private String fundResponsiblePerson;
 
+    @ApiModelProperty("资金清收责任人的部门和角色")
+    private String deptAndRole;
+
     /**
      * 申请日期
      */

@@ -30,6 +30,9 @@ public class UpdateFundCoordinationVo implements BaseVo, Serializable {
     @Length(message = "资金清收责任人最多允许32个字符！")
     private String fundResponsiblePerson;
 
+    @ApiModelProperty("资金清收责任人的部门和角色")
+    private String deptAndRole;
+
     /**
      * 订货单位
      */

@@ -7,6 +7,7 @@
         <result column="applicant" property="applicant"/>
         <result column="applicant_name" property="applicantName"/>
         <result column="fund_responsible_person" property="fundResponsiblePerson"/>
+        <result column="dept_and_role" property="deptAndRole"/>
         <result column="application_date" property="applicationDate"/>
         <result column="ordering_unit" property="orderingUnit"/>
         <result column="customer_short_id" property="customerShortId"/>
@@ -32,6 +33,7 @@
             tb.applicant,
             u.name AS applicant_name,
             tb.fund_responsible_person,
+            tb.dept_and_role,
             tb.application_date,
             tb.ordering_unit,
             tb.customer_short_id,