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

zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractDto.java

@@ -50,4 +50,6 @@ public class ContractDto extends PageParam {
 
     private String projectId;
 
+    private String year;
+
 }

zjugis-business/src/main/java/com/zjugis/business/bean/entity/Loan.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.bean.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,7 +27,7 @@ public class Loan extends BaseEntity {
 /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
 /**

zjugis-business/src/main/java/com/zjugis/business/controller/ContractController.java

@@ -47,6 +47,12 @@ public class ContractController {
         return CommonResult.success(contractService.calc(contractDto));
     }
 
+
+    @GetMapping("/contract/sign/calc")
+    public CommonResult<SumResponse> signCalc(ContractDto contractDto) {
+        return CommonResult.success(contractService.signCalc(contractDto));
+    }
+
     /**
     * 通过主键查询单条数据
     *

zjugis-business/src/main/java/com/zjugis/business/flow/loan/controller/LoanFlowController.java

@@ -38,7 +38,7 @@ public class LoanFlowController extends BaseController {
     }
     @PostMapping("/update")
     @Operation(summary = "更新")
-    public String updateLoan(@Valid LoanUpdateReqVO updateReqVO) {
+    public String updateLoan(@Valid @RequestBody LoanUpdateReqVO updateReqVO) {
         loanService.updateLoan(updateReqVO);
         return success(true);
     }

zjugis-business/src/main/java/com/zjugis/business/mapper/ContractMapper.java

@@ -31,4 +31,6 @@ public interface ContractMapper extends BaseMapperX<Contract> {
     void updateVirtualContractByProjectId(@Param("contract")Contract contract,@Param("ids") List<String> projectIds);
 
     SumResponse calc(@Param("params") ContractDto contractDto);
+
+    SumResponse signCalc(@Param("params") ContractDto contractDto);
 }

zjugis-business/src/main/java/com/zjugis/business/service/ContractService.java

@@ -53,4 +53,6 @@ public interface ContractService{
     void updateVirtualContract(Contract contract, String projectId);
 
     SumResponse calc(ContractDto contractDto);
+
+    SumResponse signCalc(ContractDto contractDto);
 }

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

@@ -1,5 +1,6 @@
 package com.zjugis.business.service.impl;
 
+import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.ContractInvoiceDto;
@@ -79,7 +80,9 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
         QueryWrapper<ContractInvoice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("INSTANCE_ID",id);
         ContractInvoice invoice = contractInvoiceMapper.selectOne(queryWrapper);
-        invoice.setContractMilestoneName(contractMilestoneService.queryById(invoice.getContractMilestoneId()).getName());
+        if(StringUtils.isNotBlank(invoice.getContractMilestoneId())){
+            invoice.setContractMilestoneName(contractMilestoneService.queryById(invoice.getContractMilestoneId()).getName());
+        }
         return invoice;
     }
 

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

@@ -141,6 +141,15 @@ public class ContractServiceImpl implements ContractService{
         return sum;
     }
 
+    /**
+     * @param contractDto
+     * @return
+     */
+    @Override
+    public SumResponse signCalc(ContractDto contractDto) {
+        return contractMapper.signCalc(contractDto);
+    }
+
 
     @Override
     public Page<Contract> page(Page<Contract> page, ContractDto contractDto) {

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

@@ -203,4 +203,39 @@
             </if>
         </where>
     </select>
+
+    <select id="signCalc" resultType="com.zjugis.business.bean.response.SumResponse">
+        SELECT NVL(SUM(NVL(c.CONTRACT_AMOUNT, 0)), 0) as amount,
+        NVL(SUM(t1.INVOICE_AMOUNT), 0) AS invoiceAmount,
+        NVL(SUM(r.RETURN_AMOUNT), 0) AS returnAmount FROM CONTRACT c
+        LEFT JOIN CONTRACT_INVOICE t1 on t1.CONTRACT_ID = c.ID
+        LEFT JOIN
+        (
+        SELECT
+        CONTRACT_INVOICE_ID,
+        NVL(sum(RETURN_AMOUNT),0) as RETURN_AMOUNT
+        FROM
+        CONTRACT_RETURN_MONEY
+        WHERE ISVALID = 1
+        GROUP BY CONTRACT_INVOICE_ID
+        ) r ON t1.ID = r.CONTRACT_INVOICE_ID
+        <if test="params != null and params.deptId != null and params.deptId != ''">
+            RIGHT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
+        </if>
+        <if test="params != null and params.managerId != null and params.managerId != ''">
+            INNER JOIN CONTRACT_AREA_MANAGER am ON am.CONTRACT_ID = c.ID
+        </if>
+        <where>
+            c.ISVALID = 1 AND c.FLOW_STATUS = 90 AND t1.ISVALID = 1 AND t1.FLOW_STATUS &gt;= 90
+            <if test="params != null and params.isSign != null">
+                AND c.IS_SIGN = #{params.isSign}
+            </if>
+            <if test="params != null and params.managerId != null  and params.managerId != ''">
+                AND AM.AREA_MANAGER_ID = #{params.managerId}
+            </if>
+            <if test="params != null and params.deptId != null and params.deptId != ''">
+                AND pr.ZRBM_ID = #{params.deptId}
+            </if>
+        </where>
+    </select>
 </mapper>

zjugis-business/src/main/resources/templates/FlowProject/apply.ftl

@@ -169,7 +169,7 @@
                   <div class="form-item">
                     <div class="form-item">
                       <div class="z-comp-select" name="project$hyId"
-                           data='${hyTypeList!}'>
+                           data='${hyTypeList!}' value="${formEntity.hyId!}">
                         <div class="z-inputselect-bar">
                           <span> ${hyName!} </span><i></i>
                         </div>

zjugis-workflow/src/main/java/com/zjugis/z_workflow/controller/IFlowInstanceController.java

@@ -186,8 +186,17 @@ public class IFlowInstanceController extends BaseController {
 	@ResponseBody
 	@RequestMapping
 	public void redirectFlowPage(String flowInstanceId,String activityInsId,String userId,Integer iMobile) throws IOException {
-		boolean isMobile = !Objects.isNull(iMobile) && iMobile.equals(1) ? true : false;
+		boolean isMobile = !Objects.isNull(iMobile) && iMobile.equals(1) ;
 		String redirectURL = iActivityInstanceService.getHandlerUrl(activityInsId,flowInstanceId,null,userId,isMobile,true,null);
 		response.sendRedirect(redirectURL);
 	}
+
+
+    @ResponseBody
+    @RequestMapping
+    public String getFlowUrl(String flowInstanceId, String activityInsId, String userId, Integer iMobile) throws IOException {
+        boolean isMobile = !Objects.isNull(iMobile) && iMobile.equals(1) ;
+        String flowUrl = iActivityInstanceService.getHandlerUrl(activityInsId,flowInstanceId,null,userId,isMobile,true,null);
+        return success(flowUrl);
+    }
 }

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/IFlowOpinionService.java

@@ -103,6 +103,7 @@ public class IFlowOpinionService {
 		if (Objects.isNull(entity.getIsvalid())) {
 			entity.setIsvalid(1);
 		}
+        entity.setOpinionContent("同意");
 		entity.setCreateTime(new Date());
 		entity.setLatestModifyTime(new Date());
 		if (Objects.isNull(entity.getIndexCode())) {
@@ -185,6 +186,7 @@ public class IFlowOpinionService {
 		entity.setId(UUID.hex32());
 		entity.setIsvalid(1);
 		entity.setCreateTime(new Date());
+        entity.setOpinionContent("同意");
 		entity.setLatestModifyTime(new Date());
 		entity.setIndexCode(getMaxSortNum() + 1);
 		return entity;
@@ -222,6 +224,7 @@ public class IFlowOpinionService {
 		iFlowOpinion.setActivityInstanceId(activityInsId);
 		iFlowOpinion.setParticipantId(participantId);
 		iFlowOpinion.setCreateTime(new Date());
+        iFlowOpinion.setOpinionContent("同意");
 		iFlowOpinion.setCreateWorker(Constant.getUserId());
 		iFlowOpinion.setFlowOpinionId(opinionTempId);
 		iFlowOpinion.setiDisplay(1);
@@ -303,10 +306,9 @@ public class IFlowOpinionService {
 		//region 获取用户签章信息
 		String siginUrl = "";//电子签章
 		String sininName = "";//文字签名
-		if(!StringUtils.isBlank(doingUserId) && !readOnly) {
+		if(!StringUtils.isBlank(doingUserId)) {
 			AdminUserRespDTO user =  callInterfaceService.getUserByUserId(doingUserId);
-			// TOOD 用户体系未添加签名
-            siginUrl = "";
+            siginUrl = user.getSignatureUrl();
 			sininName = user.getNickname();
 		} else {
 			doingUserId = "";
@@ -639,7 +641,7 @@ public class IFlowOpinionService {
 			}
 
 
-            System.out.println(opinionItem.getId() + "-----" + opinionItem.getParticipantId() + "---------------"+opinionItem.getUserId());
+//            System.out.println(opinionItem.getId() + "-----" + opinionItem.getParticipantId() + "---------------"+opinionItem.getUserId());
 			String opSininName = iActivityInsParticiPantService.selectNameByParticipantId(opinionItem.getParticipantId());
 
 			if (!StringUtils.isBlank(opinionItem.getSign())) {

zjugis-workflow/src/main/resources/mapper/oracle/IFlowInstanceMapper.xml

@@ -2635,6 +2635,24 @@
             <if test="entity.iEnd !=  null and entity.iEnd != -1">
                 AND T.I_END = ${entity.iEnd}
             </if>
+<!--            <if test="entity.iEnd != 1">-->
+<!--                AND T.ID NOT IN (-->
+<!--                SELECT AT.FID FROM-->
+<!--                (-->
+<!--                SELECT-->
+<!--                FLOW_INSTANCE_ID AS FID,-->
+<!--                COUNT ( FLOW_INSTANCE_ID ) AS C-->
+<!--                FROM-->
+<!--                I_ACTIVITY_INSTANCE I-->
+<!--                GROUP BY-->
+<!--                FLOW_INSTANCE_ID-->
+<!--                HAVING COUNT ( FLOW_INSTANCE_ID ) = 1-->
+<!--                ) AT-->
+<!--                LEFT JOIN I_ACTIVITY_INSTANCE AI ON AI.flow_instance_id = AT.FID-->
+<!--                LEFT JOIN I_ACTIVITY_INS_PARTICIPANT AIP ON AIP.ACTIVITY_INSTANCE_ID = AI.ID-->
+<!--                WHERE AIP.handle_authority = 1-->
+<!--                )-->
+<!--            </if>-->
             <if test="entity.flowTemplateVersionId != null and entity.flowTemplateVersionId != ''">
                 AND T.FLOW_TEMPLATE_VERSION_ID = #{entity.flowTemplateVersionId}
             </if>