From 11e1d93d0ebb2df5da6699e754b92f992654ec70 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 30 Jun 2023 10:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinSelectReceivablesDetailedVo.java       | 28 +++++++++----------
 .../FinSelectedReceivablesDetailedMapper.xml  | 13 ++++++++-
 .../SysFlowableConfigMapper.java              |  2 ++
 .../SysFlowableConfigMapper.xml               |  6 +++-
 .../SysFlowableConfigService.java             |  4 ++-
 .../sysorganization/SysOrganizationRest.java  |  4 ++-
 6 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java
index e665961935..c9cc0ae5d6 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java
@@ -1,6 +1,5 @@
 package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,27 +13,26 @@ import lombok.Data;
 public class FinSelectReceivablesDetailedVo implements Vo {
     private static final long serialVersionUID = -1672232048017802807L;
 
-    @ApiModelProperty("应收未收款项sid")
-    private String sid; // 应收未收款项sid
-    @ApiModelProperty("合同sid")
-    private String contractSid; // 合同sid
+    @ApiModelProperty("当前行sid")
+    private String sid;
+    @ApiModelProperty("应收未收记录sid")
+    private String receivablesSid;
     @ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
+    private String contractNo;
     @ApiModelProperty("客户sid")
-    private String customerSid; // 客户sid
+    private String customerSid;
     @ApiModelProperty("客户名称")
-    private String customerName; // 客户名称
+    private String customerName;
     @ApiModelProperty("车架号")
-    @JsonProperty("VIN")
-    private String VIN; // 车架号
+    private String vinNo;
     @ApiModelProperty("联系电话")
-    private String customerPhone; // 联系电话
+    private String customerPhone;
     @ApiModelProperty("应收项目名称")
-    private String receivablesName; // 应收项目名称
-    @ApiModelProperty("当前应收金额")
-    private String currentReceivableMoney; // 当前应收金额
+    private String receivablesName;
+    @ApiModelProperty("当前应收")
+    private String currentReceivableMoney;
 
-    @ApiModelProperty("应收金额")
+    @ApiModelProperty("剩余应收")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
index 241eb830fd..caab90e726 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
@@ -288,7 +288,18 @@
 
     <select id="selectPageList"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
-        select fd.*
+        select fd.sid,
+        fd.receivablesSid,
+        fd.contractNo,
+        fd.customerSid,
+        fd.customerName,
+        fd.customerPhone,
+        fd.receivablesName,
+        fd.currentReceivableMoney,
+        0 as reveivableMoney,
+        furd.busVinSid,
+        furd.payType,
+        furd.payTypeKey
         from fin_selected_receivables_detailed fd
         left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
         where fd.receivablesName != '订金'
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
index 385c6c978b..973c9973c1 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
@@ -24,4 +24,6 @@ public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
     int deleteBySid(String userSid);
 
     String selectBySid(String changeUserSid);
+
+    int updateDateByUserSid(String userSid);
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
index 1b8a8a42ab..f8e163025b 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.portal.biz.sysflowableconfig.SysFlowableConfigMapper">
     <select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
         select * from sys_flowable_config where userSid = #{userSid}
-        and(startDate is null or startDate &lt;#{nowDate})
+        and(startDate &lt;#{nowDate})
         and(endDate is null or endDate>#{nowDate})
     </select>
 
@@ -29,4 +29,8 @@
         left join sys_staffinfo si on si.sid = su.staffSid
         where su.sid = #{changeUserSid}
     </select>
+
+    <update id="updateDateByUserSid">
+        update sys_flowable_config set startDate = NULL,endDate = NULL WHERE userSid = #{userSid}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
index a203b8dc14..0df635d53f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
@@ -50,6 +50,8 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
     }
 
     public ResultBean setBlank(String userSid) {
-        return null;
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateDateByUserSid(userSid);
+        return rb.success();
     }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
index c6aa7e1bc3..2da6cc6515 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@@ -11,7 +11,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
-import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -131,6 +130,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
             sysOrganization.setManagerName(sysStaffinfo.getName());
             SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
             sysOrganization.setManagerSid(sysUser.getSid());
+        }else{
+            sysOrganization.setManagerName("");
+            sysOrganization.setManagerSid("");
         }
         //删除关联关系中的所有主管与分管的人员关系
         sysStaffOrgService.delZGAndFGByOrgSid(sid);