Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client/src/views/OaSystem/financialManagement/bzjglDeptPage/index.vue

@@ -240,7 +240,7 @@ const changeWriteOffTime = (value, data) => {
 }
 const applyDate = ref()
 const writeOffTime = ref()
-const costType = ref()
+const costType = ref(['1401', '1402'])
 /** 查询列表 */
 const getList = async () => {
   loading.value = true

client/src/views/OaSystem/financialManagement/bzjglPage/index.vue

@@ -243,7 +243,7 @@ const changeWriteOffTime = (value, data) => {
   }
 }
 const applyDate = ref()
-const costType = ref()
+const costType = ref(['1401', '1402'])
 const writeOffTime = ref()
 /** 查询列表 */
 const getList = async () => {

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractInvoiceExcelResponse.java

@@ -35,6 +35,8 @@ public class ContractInvoiceExcelResponse {
     private String invoiceContent;
     @ExcelProperty("金额（元）")
     private String invoiceAmount;
+    @ExcelProperty("未回款金额（元）")
+    private String unreturnAmount;
     @ExcelProperty("开票申请人")
     private String applyWorkerName;
     @ExcelProperty("付款税号")

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractInvoiceStaticsResponse.java

@@ -19,8 +19,10 @@ public class ContractInvoiceStaticsResponse {
 
     //已开票金额
     private BigDecimal ykp;
-    //已回款金额
+    // 开票已回款金额
     private BigDecimal yhk;
+    // 回款日期内回款额
+    private BigDecimal periodReturnAmount;
 
 
 }

zjugis-business/src/main/java/com/zjugis/business/enums/ErrorCodeConstants.java

@@ -26,6 +26,8 @@ public interface ErrorCodeConstants {
     ErrorCode TRANSFER_NOT_EXISTS = new ErrorCode(3-001-004-003, "调岗申请记录不存在");
     ErrorCode RESIGN_NOT_EXISTS = new ErrorCode(3-001-004-004, "离职办理记录不存在");
     ErrorCode INTERVIEW_NOT_EXISTS = new ErrorCode(3-001-004-005, "面试记录不存在");
+
+    ErrorCode RESIGN_DETAIL_NOT_EXISTS = new ErrorCode(3-001-004-006, "工作交接人不能为空");
     ErrorCode ID_CARD_EXIST = new ErrorCode(3-001-005-001, "身份证号已经存在");
     ErrorCode MOBILE_EXIST = new ErrorCode(3-001-005-003, "手机号已经存在");
     ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(3-001-003-000, "供应商入库申请记录不存在");

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignServiceImpl.java

@@ -113,6 +113,9 @@ public class ResignServiceImpl implements ResignService {
     @Override
     public void update(ResignPageReqVO vo) {
         validateExists(vo.getId());
+        if(CollectionUtil.isEmpty(vo.getFinishedList()) || CollectionUtil.isEmpty(vo.getUnfinishedList())){
+            throw exception(RESIGN_NOT_EXISTS);
+        }
         ResignDO resignDO = ResignConvert.INSTANCE.convert(vo);
         resignDAO.updateById(resignDO);
         Set<String> idList = convertSet(resignDetailDAO.selectList(new LambdaQueryWrapperX<ResignDetailDO>()

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractInvoiceServiceImpl.java

@@ -205,7 +205,7 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
         } else {
             returnAmount = relations.stream().map(ContractInvoiceRelation::getReturnAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         }
-        if(invoice.getInvoiceAmount() != null && returnAmount.compareTo(BigDecimal.ZERO) > 0 ){
+        if(invoice.getInvoiceAmount() != null){
             if(invoice.getInvoiceAmount().compareTo(returnAmount) <=0) {
                 invoice.setFlowStatus(ContractInvoiceConstants.RETURN_FINISH);
             }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractMessageServiceImpl.java

@@ -66,6 +66,9 @@ public class ContractMessageServiceImpl implements ContractMessageService {
     @Value("managerDeptId")
     private String managerDeptId;
 
+    @Value("managerPosId")
+    private String managerPosId;
+
 
     @Override
     public Page<ContractMessageResponse> page(ContractMessageDto contractMessageDto) {
@@ -189,10 +192,15 @@ public class ContractMessageServiceImpl implements ContractMessageService {
             }
         }
         CommonResult<List<AdminUserRespDTO>> userListRes = adminUserApi.getUserListByDeptIds(Collections.singletonList(managerDeptId));
+        CommonResult<List<AdminUserRespDTO>> postUserListRes = adminUserApi.getUserListByPostIds(Collections.singletonList(Long.valueOf(managerPosId)));
         List<AdminUserRespDTO> list = userListRes.getCheckedData();
+        List<AdminUserRespDTO> posUserList = postUserListRes.getCheckedData();
         for (AdminUserRespDTO user : list) {
             dingApi.sendMessage(new DingMessageDto(user.getId(), content));
         }
+        for (AdminUserRespDTO user : posUserList) {
+            dingApi.sendMessage(new DingMessageDto(user.getId(), content));
+        }
 
     }
 }

zjugis-business/src/main/resources/application-dev.yaml

@@ -68,4 +68,5 @@ xxl:
     accessToken: default_token # 执行器通讯TOKEN
 
 managerDeptId: ac4cc8f0-ad52-4ae9-9f88-c9a76f95e7fb
+managerPosId: 42
 

zjugis-business/src/main/resources/application-prod.yaml

@@ -68,4 +68,5 @@ xxl:
     accessToken: default_token # 执行器通讯TOKEN
 
 managerDeptId: ac4cc8f0-ad52-4ae9-9f88-c9a76f95e7fb
+managerPosId: 42
 

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -85,13 +85,24 @@
     <select id="getStatics" resultType="com.zjugis.business.bean.response.ContractInvoiceStaticsResponse">
         SELECT
         sum(case when T.FLOW_STATUS &gt;= 90 then T.INVOICE_AMOUNT else 0 end ) as ykp,
-        sum(NVL(T4.returnAmount,0)) as yhk
+        sum(NVL(T4.returnAmount,0)) as yhk,
+        sum(NVL(T5.returnAmount,0)) as periodReturnAmount
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
         LEFT JOIN CUSTOMER T3 ON T3.ID = T.PAY_COMPANY_ID
         LEFT JOIN
         (SELECT sum(NVL(RETURN_AMOUNT,0)) as returnAmount,count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T4 ON T4.CONTRACT_INVOICE_ID=T.ID
+        LEFT JOIN
+        (SELECT sum(NVL(RETURN_AMOUNT,0)) as returnAmount,CONTRACT_INVOICE_ID FROM CONTRACT_RETURN_MONEY
+        WHERE ISVALID = 1
+        <if test="params != null and params.returnOn != null">
+            AND RETURN_DATE &gt;= #{params.returnOn,jdbcType=DATE}
+        </if>
+        <if test="params != null and params.returnOff != null">
+            AND RETURN_DATE &lt;= #{params.returnOff,jdbcType=DATE}
+        </if>
+        GROUP BY CONTRACT_INVOICE_ID) T5 ON T5.CONTRACT_INVOICE_ID=T.ID
         <where>
             T.ISVALID = 1
             <if test="params != null and params.deptId != null and params.deptId != ''">
@@ -163,7 +174,7 @@
     </select>
 
     <select id="excel" resultType="com.zjugis.business.bean.response.ContractInvoiceExcelResponse">
-        SELECT C.NAME as invoiceCompany,U.NICKNAME AS XSRY,D.NAME as ZRBM,T3.NAME as xmlb,T2.XZQMC,T2.XMBH,T2.XMMC,T1.CONTRACT_NUMBER,T1.NAME,T.PAY_COMPANY,T.INVOICE_CONTENT,T.INVOICE_AMOUNT,T.APPLY_WORKER_NAME,T.PAY_TAX_NUMBER,T.INVOICE_BZ,T.RECEIVE_BANKACCOUNT,T.ELE_INV_RECEIVE_PHONE,T.ELE_INV_RECEIVE_EMAIL,T.CUSTOMER_NAME
+        SELECT C.NAME as invoiceCompany,U.NICKNAME AS XSRY,D.NAME as ZRBM,T3.NAME as xmlb,T2.XZQMC,T2.XMBH,T2.XMMC,T1.CONTRACT_NUMBER,T1.NAME,T.PAY_COMPANY,T.INVOICE_CONTENT,T.INVOICE_AMOUNT,(COALESCE(T.INVOICE_AMOUNT,0) - COALESCE(T5.returnAmount,0)) as unreturnAmount ,T.APPLY_WORKER_NAME,T.PAY_TAX_NUMBER,T.INVOICE_BZ,T.RECEIVE_BANKACCOUNT,T.ELE_INV_RECEIVE_PHONE,T.ELE_INV_RECEIVE_EMAIL,T.CUSTOMER_NAME
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID

zjugis-business/src/main/resources/mapper/oracle/LoanMapper.xml

@@ -69,7 +69,7 @@
     <select id="overview" resultType="com.zjugis.business.bean.response.LoanRespense">
         SELECT
         sum(case when L.FLOW_STATUS =90 then LOAN_AMOUNT else 0 end ) as totalAmount,
-        sum(case when L.IS_VERIFY =1 then LOAN_AMOUNT else 0 end ) as hexiaoAmount
+        sum(VERIFY_AMOUNT) as hexiaoAmount
         FROM LOAN L
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS UD ON UD.ID = L.WORKER_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = UD.DEPT_ID