diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index cb8b51b6..15a70092 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -103,9 +103,12 @@ public class PayIncomeContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); - pageList.getRecords().forEach(p->{ - System.out.println(JSONObject.toJSONString(p)); - }); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + + }); + } return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 98b12411..d055c01e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -79,7 +79,7 @@ public class PaySpendingContractController extends JeroController edit(@RequestBody PaySpendingContract paySpendingContract) { paySpendingContractService.updateById(paySpendingContract); return Result.OK("编辑成功!"); @@ -93,7 +93,7 @@ public class PaySpendingContractController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractService.removeById(id); return Result.OK("删除成功!"); @@ -107,7 +107,7 @@ public class PaySpendingContractController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java index 612ec817..23eae046 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java @@ -17,8 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; /** * @Description: pay_spending_contract_installment @@ -26,7 +24,7 @@ import io.swagger.annotations.ApiOperation; * @Date: 2021-09-07 * @Version: V1.0 */ -@Api(tags="pay_spending_contract_installment") +//@Api(tags="pay_spending_contract_installment") @RestController @RequestMapping("/contract/paySpendingContractInstallment") @Slf4j @@ -44,7 +42,7 @@ public class PaySpendingContractInstallmentController extends JeroController queryPageList(PaySpendingContractInstallment paySpendingContractInstallment, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -63,7 +61,7 @@ public class PaySpendingContractInstallmentController extends JeroController add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { paySpendingContractInstallmentService.save(paySpendingContractInstallment); @@ -77,8 +75,8 @@ public class PaySpendingContractInstallmentController extends JeroController edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { paySpendingContractInstallmentService.updateById(paySpendingContractInstallment); return Result.OK("编辑成功!"); @@ -91,8 +89,8 @@ public class PaySpendingContractInstallmentController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractInstallmentService.removeById(id); return Result.OK("删除成功!"); @@ -105,8 +103,8 @@ public class PaySpendingContractInstallmentController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -119,7 +117,7 @@ public class PaySpendingContractInstallmentController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java index d9d56bdb..ccae0538 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java @@ -13,6 +13,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + /** * @Description: pay_income_contract_associated * @Author: jeecg-boot @@ -34,14 +38,18 @@ public class PayIncomeContractAssociated implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private java.lang.String contractId; /**项目id*/ @Excel(name = "项目id", width = 15) @ApiModelProperty(value = "项目id") + @Size(max = 32, message = "项目id长度不能大于32个字符") private java.lang.String projectId; /**项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）*/ @Excel(name = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）", width = 15) @ApiModelProperty(value = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）") + @Max(5) + @Min(1) private java.lang.Integer projectType; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java index 7137846b..3352a671 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java @@ -14,6 +14,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + /** * @Description: pay_income_contract_audit * @Author: jeecg-boot @@ -35,15 +39,19 @@ public class PayIncomeContractAudit implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private java.lang.String contractId; /**合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）*/ @Excel(name = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）", width = 15) @ApiModelProperty(value = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）") @Dict(dicCode = "revenue_contract_status") + @Max(5) + @Min(1) private java.lang.Integer contractStatus; /**拒绝说明*/ @Excel(name = "拒绝说明", width = 15) @ApiModelProperty(value = "拒绝说明") + @Size(max = 200, message = "拒绝说明长度不能大于200个字符") private java.lang.String explainRemarks; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java index 16215228..6b2b2cc3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java @@ -13,6 +13,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Size; + /** * @Description: pay_income_contract_installment * @Author: jeecg-boot @@ -34,14 +37,17 @@ public class PayIncomeContractInstallment implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private java.lang.String contractId; /**阶段*/ @Excel(name = "阶段", width = 15) @ApiModelProperty(value = "阶段") + @Size(max = 50, message = "阶段长度不能大于50个字符") private java.lang.String phaseName; /**应收金额*/ @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") + @Max(value = 999999999,message = "应收金额格式错误") private java.lang.Integer accountsReceivableAmount; /**应收时间*/ @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") @@ -52,6 +58,7 @@ public class PayIncomeContractInstallment implements Serializable { /**实收金额*/ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") + @Max(value = 999999999,message = "实收金额格式错误") private java.lang.Integer paidAmount; /**实收时间*/ @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index 526c4ac3..a7f85823 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -14,6 +14,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Size; + /** * @Description: pay_spending_contract_installment * @Author: jeecg-boot @@ -35,14 +38,17 @@ public class PaySpendingContractInstallment implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private String contractId; /**阶段名称*/ @Excel(name = "阶段名称", width = 15) @ApiModelProperty(value = "阶段名称") + @Size(max = 50, message = "阶段名称长度不能大于50个字符") private String phaseName; /**应收金额*/ @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") + @Max(value = 999999999,message = "应收金额格式错误") private Integer accountsReceivableAmount; /**应收时间*/ @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") @@ -53,6 +59,7 @@ public class PaySpendingContractInstallment implements Serializable { /**实收金额*/ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") + @Max(value = 999999999,message = "应收金额格式错误") private Integer paidAmount; /**实收时间*/ @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index fb04ad27..7406dd95 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -3,13 +3,15 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index a782c215..4ababf7c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -33,4 +33,13 @@ public interface IPayWorkingGroupService extends IService { * @Exception */ List queryListByCompany(String companyId,String workingGroupProject,String year,String projectType); + /** + * @Description 查询不存在成员单位的列表 + * @Author lqt + * @Date 2021/9/7 + * @Param + * @Return + * @Exception + */ + List queryListByNotCompany(String companyId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 257610cd..878a679e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -34,4 +34,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryListByCompany(String companyId,String workingGroupProject, String year,String projectType) { return payWorkingGroupMapper.queryListByCompany(companyId,workingGroupProject,year,projectType); } + + @Override + public List queryListByNotCompany(String companyId) { + return payWorkingGroupMapper.queryListByNotCompany(companyId); + } }