变更待办审核

his-uncles-father

2021-04-01 1c1f1f8524b7634078199d71ced0666201c7d17c

变更待办审核

 service-store/src/main/java/com/java110/store/api/ContractApi.java

@@ -143,6 +143,7 @@

    @Autowired
    private IPrintContractTemplateBMO printContractTemplateBMO;

    /**
     * 微信保存消息模板
     *
@@ -345,7 +346,50 @@
        return getContractBMOImpl.queryContractHistoryTask(auditUser);
    }

    /**
     * 合同变更待办
     *
     * @param storeId 商户ID
     * @return
     * @serviceCode /contract/queryContractChangeTask
     * @path /app/contract/queryContractChangeTask
     */
    @RequestMapping(value = "/queryContractChangeTask", method = RequestMethod.GET)
    public ResponseEntity<String> queryContractChangeTask(@RequestHeader(value = "store-id") String storeId,
                                                    @RequestHeader(value = "user-id") String userId,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
        AuditUser auditUser = new AuditUser();
        auditUser.setUserId(userId);
        auditUser.setPage(page);
        auditUser.setRow(row);
        auditUser.setStoreId(storeId);

        return getContractBMOImpl.queryContractChangeTask(auditUser);
    }

    /**
     * 合同变更已办
     *
     * @param storeId 商户ID
     * @return
     * @serviceCode /contract/queryContractChangeHistoryTask
     * @path /app/contract/queryContractChangeHistoryTask
     */
    @RequestMapping(value = "/queryContractChangeHistoryTask", method = RequestMethod.GET)
    public ResponseEntity<String> queryContractChangeHistoryTask(@RequestHeader(value = "store-id") String storeId,
                                                           @RequestHeader(value = "user-id") String userId,
                                                           @RequestParam(value = "page") int page,
                                                           @RequestParam(value = "row") int row) {


        AuditUser auditUser = new AuditUser();
        auditUser.setUserId(userId);
        auditUser.setPage(page);
        auditUser.setRow(row);
        auditUser.setStoreId(storeId);
        return getContractBMOImpl.queryContractChangeHistoryTask(auditUser);
    }

    /**
     * 微信保存消息模板

 service-store/src/main/java/com/java110/store/bmo/contract/IGetContractBMO.java

@@ -16,8 +16,12 @@
     */
    ResponseEntity<String> get(ContractDto contractDto);


    ResponseEntity<String> queryContractTask(AuditUser auditUser);

    ResponseEntity<String> queryContractHistoryTask(AuditUser auditUser);

    ResponseEntity<String> queryContractChangeTask(AuditUser auditUser);

    ResponseEntity<String> queryContractChangeHistoryTask(AuditUser auditUser);

}

 service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java

@@ -3,9 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractAttr.ContractAttrDto;
import com.java110.dto.contractChangePlan.ContractChangePlanDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
import com.java110.intf.store.IContractAttrInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.store.bmo.contract.IGetContractBMO;
@@ -33,6 +35,8 @@
    @Autowired
    private IContractApplyUserInnerServiceSMO contractApplyUserInnerServiceSMOImpl;

    @Autowired
    private IContractChangeUserInnerServiceSMO contractChangeUserInnerServiceSMO;
    /**
     * @param contractDto
     * @return 订单服务能够接受的报文
@@ -56,6 +60,46 @@

        return responseEntity;
    }
    @Override
    public ResponseEntity<String> queryContractChangeTask(AuditUser auditUser) {
        long count = contractChangeUserInnerServiceSMO.getUserTaskCount(auditUser);

        List<ContractDto> contractDtos = null;

        if (count > 0) {
            List<ContractChangePlanDto> purchaseApplyDtos = contractChangeUserInnerServiceSMO.getUserTasks(auditUser);
            contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
        } else {
            contractDtos = new ArrayList<>();
        }
        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        return responseEntity;
    }

    @Override
    public ResponseEntity<String> queryContractChangeHistoryTask(AuditUser auditUser) {

        long count = contractChangeUserInnerServiceSMO.getUserHistoryTaskCount(auditUser);

        List<ContractDto> contractDtos = null;

        if (count > 0) {
            List<ContractChangePlanDto> purchaseApplyDtos = contractChangeUserInnerServiceSMO.getUserHistoryTasks(auditUser);
            contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
        } else {
            contractDtos = new ArrayList<>();
        }
        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        return responseEntity;
    }



    @Override
    public ResponseEntity<String> queryContractTask(AuditUser auditUser) {