LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息修改,添加日志，权限

Browse Source
This commit is contained in:
梁琦涛
2021-09-26 09:20:35 +08:00
parent 83c31ceba7
commit 964fa0edb4
46 changed files with 928 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java
+20 -20
View File
@@ -42,9 +42,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param req
* @return
*/
@AutoLog(value = "收入合同关联-分页列表查询")
// @ApiOperation(value="收入合同关联-分页列表查询", notes="收入合同关联-分页列表查询")
@GetMapping(value = "/list")
// @AutoLog(value = "收入合同关联-分页列表查询")
// // @ApiOperation(value="收入合同关联-分页列表查询", notes="收入合同关联-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContractAssociated payIncomeContractAssociated,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -61,9 +61,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param payIncomeContractAssociated
* @return
*/
@AutoLog(value = "收入合同关联-添加")
// @ApiOperation(value="收入合同关联-添加", notes="收入合同关联-添加")
@PostMapping(value = "/add")
// @AutoLog(value = "收入合同关联-添加")
//// @ApiOperation(value="收入合同关联-添加", notes="收入合同关联-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
payIncomeContractAssociatedService.save(payIncomeContractAssociated);
return Result.OK("添加成功！");
@@ -75,9 +75,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param payIncomeContractAssociated
* @return
*/
@AutoLog(value = "收入合同关联-编辑")
// @ApiOperation(value="收入合同关联-编辑", notes="收入合同关联-编辑")
@PostMapping(value = "/edit")
// @AutoLog(value = "收入合同关联-编辑")
// // @ApiOperation(value="收入合同关联-编辑", notes="收入合同关联-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
payIncomeContractAssociatedService.updateById(payIncomeContractAssociated);
return Result.OK("编辑成功!");
@@ -89,9 +89,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param id
* @return
*/
@AutoLog(value = "收入合同关联-通过id删除")
// @ApiOperation(value="收入合同关联-通过id删除", notes="收入合同关联-通过id删除")
@GetMapping(value = "/delete")
// @AutoLog(value = "收入合同关联-通过id删除")
// // @ApiOperation(value="收入合同关联-通过id删除", notes="收入合同关联-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payIncomeContractAssociatedService.removeById(id);
return Result.OK("删除成功!");
@@ -103,9 +103,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param ids
* @return
*/
@AutoLog(value = "收入合同关联-批量删除")
// @ApiOperation(value="收入合同关联-批量删除", notes="收入合同关联-批量删除")
@GetMapping(value = "/deleteBatch")
// @AutoLog(value = "收入合同关联-批量删除")
// // @ApiOperation(value="收入合同关联-批量删除", notes="收入合同关联-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payIncomeContractAssociatedService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
@@ -117,9 +117,9 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param id
* @return
*/
@AutoLog(value = "收入合同关联-通过id查询")
// @ApiOperation(value="收入合同关联-通过id查询", notes="收入合同关联-通过id查询")
@GetMapping(value = "/queryById")
// @AutoLog(value = "收入合同关联-通过id查询")
// // @ApiOperation(value="收入合同关联-通过id查询", notes="收入合同关联-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(id);
if(payIncomeContractAssociated==null) {
@@ -134,7 +134,7 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param request
* @param payIncomeContractAssociated
*/
@RequestMapping(value = "/exportXls")
// @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractAssociated payIncomeContractAssociated) {
return super.exportXls(request, payIncomeContractAssociated, PayIncomeContractAssociated.class, "pay_income_contract_associated");
}
@@ -146,7 +146,7 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayIncomeContractAssociated.class);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java
+20 -20
View File
@@ -41,9 +41,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param req
* @return
*/
@AutoLog(value = "审核记录-分页列表查询")
// @ApiOperation(value="审核记录-分页列表查询", notes="审核记录-分页列表查询")
@GetMapping(value = "/list")
// @AutoLog(value = "审核记录-分页列表查询")
// // @ApiOperation(value="审核记录-分页列表查询", notes="审核记录-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContractAudit payIncomeContractAudit,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -60,9 +60,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param payIncomeContractAudit
* @return
*/
@AutoLog(value = "审核记录-添加")
// @ApiOperation(value="审核记录-添加", notes="审核记录-添加")
@PostMapping(value = "/add")
// @AutoLog(value = "审核记录-添加")
// // @ApiOperation(value="审核记录-添加", notes="审核记录-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
payIncomeContractAuditService.save(payIncomeContractAudit);
return Result.OK("添加成功！");
@@ -74,9 +74,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param payIncomeContractAudit
* @return
*/
@AutoLog(value = "审核记录-编辑")
// @ApiOperation(value="审核记录-编辑", notes="审核记录-编辑")
@PostMapping(value = "/edit")
// @AutoLog(value = "审核记录-编辑")
// // @ApiOperation(value="审核记录-编辑", notes="审核记录-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
payIncomeContractAuditService.updateById(payIncomeContractAudit);
return Result.OK("编辑成功!");
@@ -88,9 +88,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param id
* @return
*/
@AutoLog(value = "审核记录-通过id删除")
// @ApiOperation(value="审核记录-通过id删除", notes="审核记录-通过id删除")
@GetMapping(value = "/delete")
// @AutoLog(value = "审核记录-通过id删除")
// // @ApiOperation(value="审核记录-通过id删除", notes="审核记录-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payIncomeContractAuditService.removeById(id);
return Result.OK("删除成功!");
@@ -102,9 +102,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param ids
* @return
*/
@AutoLog(value = "审核记录-批量删除")
// @ApiOperation(value="审核记录-批量删除", notes="审核记录-批量删除")
@GetMapping(value = "/deleteBatch")
// @AutoLog(value = "审核记录-批量删除")
// // @ApiOperation(value="审核记录-批量删除", notes="审核记录-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payIncomeContractAuditService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
@@ -116,9 +116,9 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param id
* @return
*/
@AutoLog(value = "审核记录-通过id查询")
// @ApiOperation(value="审核记录-通过id查询", notes="审核记录-通过id查询")
@GetMapping(value = "/queryById")
// @AutoLog(value = "审核记录-通过id查询")
// // @ApiOperation(value="审核记录-通过id查询", notes="审核记录-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayIncomeContractAudit payIncomeContractAudit = payIncomeContractAuditService.getById(id);
if(payIncomeContractAudit==null) {
@@ -133,7 +133,7 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param request
* @param payIncomeContractAudit
*/
@RequestMapping(value = "/exportXls")
// @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractAudit payIncomeContractAudit) {
return super.exportXls(request, payIncomeContractAudit, PayIncomeContractAudit.class, "pay_income_contract_audit");
}
@@ -145,7 +145,7 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayIncomeContractAudit.class);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+20 -5
View File
@@ -30,6 +30,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.def.MapExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
@@ -78,7 +79,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param startTime 开始时间
* @param endTime 结束时间
*/
@AutoLog(value = "收入合同-分页列表查询")
@RequiresPermissions("revenueContract:search")
@ApiOperation(value="收入合同-分页列表查询", notes="收入合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContract payIncomeContract,
@@ -107,7 +108,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param input 收入合同
*/
@AutoLog(value = "收入合同-添加")
@RequiresPermissions("revenueContract:add")
@ApiOperation(value="收入合同-添加", notes="收入合同-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractInput input) {
@@ -121,6 +124,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param contractNum 合同编号
* @return
*/
@AutoLog(value = "收入合同-验证合同编号是否存在")
@ApiOperation(value="收入合同-验证合同编号是否存在", notes="收入合同-验证合同编号是否存在")
@GetMapping(value = "/getContractNum")
public Result<?> getContractNum(@RequestParam(name="contractNum") String contractNum) {
@@ -146,6 +150,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param contractName 合同名称
* @return
*/
@AutoLog(value = "收入合同-验证合同名称是否存在")
@ApiOperation(value="收入合同-验证合同名称是否存在", notes="收入合同-验证合同名称是否存在")
@GetMapping(value = "/getContractName")
public Result<?> getContractName(@RequestParam(name="contractName") String contractName) {
@@ -172,6 +177,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param id 普通项目管理id
* @return
*/
@AutoLog(value = "收入合同-查询该项目是否关联了合同")
@ApiOperation(value="收入合同-通过id查询该项目是否关联了合同", notes="收入合同-通过id查询该项目是否关联了合同")
@GetMapping(value = "/getContractById")
public Result<?> getContractById(@RequestParam(name="id") String id) {
@@ -197,7 +203,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param input 收入合同
*/
@AutoLog(value = "收入合同-编辑")
@RequiresPermissions("revenueContract:edit")
@ApiOperation(value="收入合同-编辑", notes="收入合同-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractInput input) {
@@ -211,7 +219,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param contractId 合同id
* @return
*/
@AutoLog(value = "收入合同-关联")
@AutoLog(value = "收入合同-关联项目列表")
@ApiOperation(value="收入合同-关联", notes="收入合同-关联")
@GetMapping(value = "/getAssociated")
public Result<?> getAssociated(@RequestParam("contractId") String contractId) {
@@ -233,6 +241,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @return
*/
@AutoLog(value = "收入合同-关联")
@RequiresPermissions("revenueContractModule:chooseProject")
@ApiOperation(value="收入合同-关联", notes="收入合同-关联")
@PostMapping(value = "/associated")
public Result<?> associated(@RequestBody List<PayIncomeContractAssociated> listPayIncomeContractAssociated) {
@@ -247,6 +256,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @return
*/
@AutoLog(value = "收入合同-取消关联")
@RequiresPermissions("revenueContractModule:unlinkProject")
@ApiOperation(value="收入合同-取消关联", notes="收入合同-取消关联")
@PostMapping(value = "/cancelAssociated")
public Result<?> cancelAssociated(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
@@ -273,6 +283,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param payIncomeContractAudit 审核记录
*/
@AutoLog(value = "收入合同-审核")
@RequiresPermissions("revenueContract:aduit")
@ApiOperation(value="收入合同-审核", notes="收入合同-审核")
@PostMapping(value = "/audit")
public Result<?> audit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
@@ -289,6 +300,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param payIncomeContractAudit 审核记录
*/
@AutoLog(value = "收入合同-归档")
@RequiresPermissions("revenueContract:archive")
@ApiOperation(value="收入合同-归档", notes="收入合同-归档")
@PostMapping(value = "/archive")
public Result<?> archive(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
@@ -304,7 +316,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param id 合同id
*/
@AutoLog(value = "收入合同-通过id删除")
@AutoLog(value = "收入合同-删除")
@RequiresPermissions("revenueContract:delete")
@ApiOperation(value="收入合同-通过id删除", notes="收入合同-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id") String id) {
@@ -321,6 +334,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param ids 合同id逗号分隔
*/
@AutoLog(value = "收入合同-批量删除")
@RequiresPermissions("revenueContract:batchDel")
@ApiOperation(value="收入合同-批量删除", notes="收入合同-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -342,7 +356,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param id 合同id
*/
@AutoLog(value = "收入合同-通过id查询详情")
@ApiOperation(value="收入合同-通过id查询详情", notes="收入合同-通过id查询详情")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -414,6 +427,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param request
* @param payIncomeContract 收入合同
*/
@AutoLog(value = "收入合同-导出excel")
@RequiresPermissions("revenueContract:export")
@ApiOperation(value="收入合同-导出excel", notes="收入合同-导出excel")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayIncomeContract payIncomeContract) {
@@ -523,7 +538,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayIncomeContract.class);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java
+20 -20
View File
@@ -43,9 +43,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param req
* @return
*/
@AutoLog(value = "分期信息-分页列表查询")
// @ApiOperation(value="分期信息-分页列表查询", notes="分期信息-分页列表查询")
@GetMapping(value = "/list")
// @AutoLog(value = "分期信息-分页列表查询")
// // @ApiOperation(value="分期信息-分页列表查询", notes="分期信息-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContractInstallment payIncomeContractInstallment,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -62,9 +62,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param payIncomeContractInstallment
* @return
*/
@AutoLog(value = "分期信息-添加")
// @ApiOperation(value="分期信息-添加", notes="分期信息-添加")
@PostMapping(value = "/add")
// @AutoLog(value = "分期信息-添加")
// // @ApiOperation(value="分期信息-添加", notes="分期信息-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
payIncomeContractInstallmentService.save(payIncomeContractInstallment);
return Result.OK("添加成功！");
@@ -76,9 +76,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param payIncomeContractInstallment
* @return
*/
@AutoLog(value = "分期信息-编辑")
// @ApiOperation(value="分期信息-编辑", notes="分期信息-编辑")
@PostMapping(value = "/edit")
// @AutoLog(value = "分期信息-编辑")
// // @ApiOperation(value="分期信息-编辑", notes="分期信息-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
payIncomeContractInstallmentService.updateById(payIncomeContractInstallment);
return Result.OK("编辑成功!");
@@ -90,9 +90,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param id
* @return
*/
@AutoLog(value = "分期信息-通过id删除")
// @ApiOperation(value="分期信息-通过id删除", notes="分期信息-通过id删除")
@GetMapping(value = "/delete")
// @AutoLog(value = "分期信息-通过id删除")
// // @ApiOperation(value="分期信息-通过id删除", notes="分期信息-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payIncomeContractInstallmentService.removeById(id);
return Result.OK("删除成功!");
@@ -104,9 +104,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param ids
* @return
*/
@AutoLog(value = "分期信息-批量删除")
// @ApiOperation(value="分期信息-批量删除", notes="分期信息-批量删除")
@GetMapping(value = "/deleteBatch")
// @AutoLog(value = "分期信息-批量删除")
// // @ApiOperation(value="分期信息-批量删除", notes="分期信息-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payIncomeContractInstallmentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
@@ -118,9 +118,9 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param id
* @return
*/
@AutoLog(value = "分期信息-通过id查询")
// @ApiOperation(value="分期信息-通过id查询", notes="分期信息-通过id查询")
@GetMapping(value = "/queryById")
// @AutoLog(value = "分期信息-通过id查询")
// // @ApiOperation(value="分期信息-通过id查询", notes="分期信息-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayIncomeContractInstallment payIncomeContractInstallment = payIncomeContractInstallmentService.getById(id);
if(payIncomeContractInstallment==null) {
@@ -135,7 +135,7 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param request
* @param payIncomeContractInstallment
*/
@RequestMapping(value = "/exportXls")
// @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractInstallment payIncomeContractInstallment) {
return super.exportXls(request, payIncomeContractInstallment, PayIncomeContractInstallment.class, "pay_income_contract_installment");
}
@@ -147,7 +147,7 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PayIncomeContractInstallment.class);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+15 -4
View File
@@ -29,6 +29,7 @@ import com.jero.contract.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.def.MapExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
@@ -71,7 +72,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param endTime 结束时间
* @return
*/
@AutoLog(value = "支出合同-分页列表查询")
@RequiresPermissions("expenditureContract:search")
@ApiOperation(value="支出合同-分页列表查询", notes="支出合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PaySpendingContract paySpendingContract,
@@ -99,6 +100,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @return
*/
@AutoLog(value = "支出合同-添加")
@RequiresPermissions("expenditureContract:add")
@ApiOperation(value="支出合同-添加", notes="支出合同-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PaySpendingContractInput input) {
@@ -113,6 +115,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @return
*/
@AutoLog(value = "支出合同-编辑")
@RequiresPermissions("expenditureContract:edit")
@ApiOperation(value="支出合同-编辑", notes="支出合同-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PaySpendingContractInput input) {
@@ -125,6 +128,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param contractNum 合同编号
* @return
*/
@AutoLog(value = "支出合同-验证合同编号是否存在")
@ApiOperation(value="收入合同-验证合同编号是否存在", notes="收入合同-验证合同编号是否存在")
@GetMapping(value = "/getContractNum")
public Result<?> getContractNum(@RequestParam(name="contractNum") String contractNum) {
@@ -150,7 +154,8 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param id
* @return
*/
@AutoLog(value = "支出合同-通过id删除")
@AutoLog(value = "支出合同-删除")
@RequiresPermissions("expenditureContract:delete")
@ApiOperation(value="支出合同-通过id删除", notes="支出合同-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id") String id) {
@@ -168,6 +173,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @return
*/
@AutoLog(value = "支出合同-批量删除")
@RequiresPermissions("expenditureContract:batchDel")
@ApiOperation(value="支出合同-批量删除", notes="支出合同-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -190,7 +196,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param id
* @return
*/
@AutoLog(value = "支出合同-通过id查询")
@AutoLog(value = "支出合同-查询详情")
@ApiOperation(value="支出合同-通过id查询", notes="支出合同-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -223,6 +229,8 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
*
* @return
*/
@AutoLog(value = "支出合同-模板下载")
@RequiresPermissions("expenditureContract:downTemplate")
@ApiOperation(value="支出合同-模板下载", notes="支出合同-模板下载")
@GetMapping(value = "/downloadExcelModel")
public ModelAndView downloadExcelModel() {
@@ -235,6 +243,8 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param request
* @param paySpendingContract
*/
@AutoLog(value = "支出合同-导出excel")
@RequiresPermissions("expenditureContract:export")
@GetMapping(value = "/exportXls")
@ApiOperation(value="支出合同-导出excel", notes="支出合同-导出excel")
public ModelAndView exportXls(HttpServletRequest request, PaySpendingContract paySpendingContract) {
@@ -345,9 +355,10 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param response
* @return
*/
@AutoLog(value = "支出合同-excel导入数据")
@RequiresPermissions("expenditureContract:import")
@PostMapping(value = "/importExcel")
@ApiOperation(value="支出合同-通过excel导入数据", notes="支出合同-通过excel导入数据")
@Transactional
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
paySpendingContractService.importExcel(request);
return Result.OK("文件导入成功！");
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java
+12 -12
View File
@@ -41,9 +41,9 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param req
* @return
*/
@AutoLog(value = "pay_spending_contract_installment-分页列表查询")
// @ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询")
@GetMapping(value = "/list")
// @AutoLog(value = "pay_spending_contract_installment-分页列表查询")
//// @ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PaySpendingContractInstallment paySpendingContractInstallment,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -60,9 +60,9 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param paySpendingContractInstallment
* @return
*/
@AutoLog(value = "pay_spending_contract_installment-添加")
// @ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加")
@PostMapping(value = "/add")
// @AutoLog(value = "pay_spending_contract_installment-添加")
//// @ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) {
paySpendingContractInstallmentService.save(paySpendingContractInstallment);
return Result.OK("添加成功！");
@@ -76,7 +76,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
*/
@AutoLog(value = "pay_spending_contract_installment-编辑")
// @ApiOperation(value="pay_spending_contract_installment-编辑", notes="pay_spending_contract_installment-编辑")
@PostMapping(value = "/edit")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) {
paySpendingContractInstallmentService.updateById(paySpendingContractInstallment);
return Result.OK("编辑成功!");
@@ -90,7 +90,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
*/
@AutoLog(value = "pay_spending_contract_installment-通过id删除")
// @ApiOperation(value="pay_spending_contract_installment-通过id删除", notes="pay_spending_contract_installment-通过id删除")
@GetMapping(value = "/delete")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paySpendingContractInstallmentService.removeById(id);
return Result.OK("删除成功!");
@@ -104,7 +104,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
*/
@AutoLog(value = "pay_spending_contract_installment-批量删除")
// @ApiOperation(value="pay_spending_contract_installment-批量删除", notes="pay_spending_contract_installment-批量删除")
@GetMapping(value = "/deleteBatch")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
@@ -118,7 +118,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
*/
@AutoLog(value = "pay_spending_contract_installment-通过id查询")
// @ApiOperation(value="pay_spending_contract_installment-通过id查询", notes="pay_spending_contract_installment-通过id查询")
@GetMapping(value = "/queryById")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id);
if(paySpendingContractInstallment==null) {
@@ -133,7 +133,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param request
* @param paySpendingContractInstallment
*/
@RequestMapping(value = "/exportXls")
// @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PaySpendingContractInstallment paySpendingContractInstallment) {
return super.exportXls(request, paySpendingContractInstallment, PaySpendingContractInstallment.class, "pay_spending_contract_installment");
}
@@ -145,7 +145,7 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, PaySpendingContractInstallment.class);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java
+25 -11
View File
@@ -1,7 +1,13 @@
package com.jero.contract.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.HuaWeiSmsUtil;
import com.jero.common.util.PasswordUtil;
import com.jero.contract.entity.PayIncomeContractInstallment;
@@ -10,10 +16,13 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService;
import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
/**
@@ -26,26 +35,31 @@ import java.util.List;
public class PayIncomeContractInstallmentServiceImpl extends ServiceImpl<PayIncomeContractInstallmentMapper, PayIncomeContractInstallment> implements IPayIncomeContractInstallmentService {
@Resource
private PayIncomeContractInstallmentMapper payIncomeContractInstallmentMapper;
@Autowired
private HuaWeiSmsUtil huaWeiSmsUtil;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Resource
private SendMessageService sendMessageService;
@Override
public void sendSMSIncomeContract() {
List<PayIncomeContractInstallment> list = payIncomeContractInstallmentMapper.getIncomeContract();
list.forEach(p->{
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(p.getPhone())){
String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
+ "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
// huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg);
sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
}
if(!StringUtils.isBlank(p.getEmail())){
String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
+ "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg);
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
// todo 缺少发消息
HashMap<String,String> map = new HashMap<>();
map.put("contract",p.getContractName());
map.put("num",p.getPhaseName());
map.put("amount", String.valueOf(p.getAccountsReceivableAmount()));
sendMessageDTO.setFromUser("admin");
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG8.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE8");
sendMessageService.SendMessageService(sendMessageDTO);
});
}
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+95 -4
View File
@@ -1,5 +1,6 @@
package com.jero.contract.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,16 +30,21 @@ import com.jero.contract.service.IPayIncomeContractService;
import com.jero.contract.vo.PayIncomeContractInput;
import com.jero.contract.vo.ProjectOutput;
import com.jero.meeting.common.MeetingSubitemCommon;
import com.jero.meeting.entity.PayMeeting;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingService;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProject;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.entity.TbMemberProject;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.member.service.ITbMemberProjectService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.common.PackCommon;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.project.common.PayProjectCommon;
@@ -107,6 +113,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource
private SendMessageService sendMessageService;
@Resource
private ITbMemberProjectService tbMemberProjectService;
@Resource
private IPayMeetingService payMeetingService;
@Override
public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
@@ -296,6 +306,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
listPayIncomeContractAssociated.forEach(p->{
String projectName = "";
ProjectOutput projectOutput = new ProjectOutput();
StringBuilder msgPayIncomeContractAssociated = ValidUtil.validateAll(p);
if(!StringUtils.isBlank(msgPayIncomeContractAssociated)){
@@ -338,6 +349,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
}
}
projectName = payCommonProject.getChargeProject();
// 更新项目id
p.setProjectId(payCommonProject.getId());
break;
@@ -379,6 +391,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
}
}
projectName = payWorkingGroup.getWorkingGroupProject();
// 更新项目id
p.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
break;
@@ -392,6 +405,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(Objects.isNull(payMeetingSituation)){
throw new JeroBootException("会员项目不存在！");
}
PayMeeting payMeeting = payMeetingService.getById(payMeetingSituation.getMeetingId());
if (Objects.isNull(payMeeting)) {
throw new JeroBootException("会员项目不存在！");
}
// 验证企业是否正确
if(!Objects.equals(payMeetingSituation.getCompanyId(),payIncomeContract.getSignedCompanyId())){
throw new JeroBootException("企业不匹配！");
@@ -403,6 +420,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
// 验证项目是否已被关联
getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
projectName = payMeeting.getMeetingName();
// 更新项目id
p.setProjectId(payMeetingSituation.getId());
break;
@@ -443,6 +461,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
}
}
projectName = payMemberProject.getProjectName();
p.setProjectId(listPayMemberProjectSubitem.get(0).getId());
break;
case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -451,6 +470,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(Objects.isNull(tbMemberProjectSubitem)){
throw new JeroBootException("标协会员项目不存在！");
}
TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMemberProjectSubitem.getProjectId());
if(Objects.isNull(tbMemberProject)){
throw new JeroBootException("标协会员项目不存在！");
}
// 验证企业是否正确
if(!Objects.equals(tbMemberProjectSubitem.getCompanyId(),payIncomeContract.getSignedCompanyId())){
throw new JeroBootException("企业不匹配！");
@@ -472,6 +495,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payPackCompanyProjectService.setPack(tbMemberProjectSubitem.getCompanyId(),tbMemberProjectSubitem.getLiaisonManId(),payIncomeContract.getPackYear(),tbMemberProjectSubitem.getId(),PayIncomeContractCommon.PROJECT_TYPE5,payIncomeContract.getPack());
}
}
projectName = tbMemberProject.getProjectName();
p.setProjectId(tbMemberProjectSubitem.getId());
break;
default:break;
@@ -479,6 +503,32 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payIncomeContractAssociatedService.save(p);
projectOutput.setContractId(p.getContractId());
projectOutput.setId(p.getId());
// 合同选择了打包
if(Objects.equals(payIncomeContract.getPack(), PackCommon.PACKAGING1)){
// 获取项目负责人，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR));
if(!CollectionUtils.isEmpty(list)){
String finalProjectName = projectName;
list.forEach(item->{
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(item.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
}
HashMap<String,String> map = new HashMap<>();
map.put("projectName", finalProjectName);
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setToUser(item.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("M_OPEN_TYPE7");
JSONObject json = new JSONObject();
json.put("id",p.getProjectId());
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
});
}
}
});
}
/**
@@ -667,7 +717,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
updatePayIncomeContract.eq(PayIncomeContract::getId,payIncomeContract.getId());
updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS2);
payIncomeContractService.update(updatePayIncomeContract);
// todo 缺少发送消息
// 获取项目负责人，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
if(!CollectionUtils.isEmpty(list)){
@@ -680,12 +729,14 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
HashMap<String,String> map = new HashMap<>();
map.put("contractNum",payIncomeContractNew.getContractNum());
map.put("contractName",payIncomeContractNew.getContractName());
sendMessageDTO.setFromUser(sysUser.getId());
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setToUser(p.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG2.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("email");
sendMessageDTO.setBusId(p.getId());
sendMessageDTO.setBusType("M_OPEN_TYPE2");
JSONObject json = new JSONObject();
json.put("revenueId",payIncomeContractNew.getId());
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
});
}
@@ -799,6 +850,46 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payIncomeContractService.update(update);
// 添加审核记录
payIncomeContractAuditService.save(payIncomeContractAudit);
String code = "";
String role = "";
String type = "";
// 审核通过
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
code = ManagementMessageEnums.MSG3.getCode();
type = "M_OPEN_TYPE3";
role = RoleCommon.CWRY;
}
// 审核未通过
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4)){
code = ManagementMessageEnums.MSG4.getCode();
type = "M_OPEN_TYPE4";
role = RoleCommon.HTFZR;
}
// 获取项目负责人，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(role));
if(!CollectionUtils.isEmpty(list)){
String finalType = type;
String finalCode = code;
list.forEach(p->{
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(p.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
HashMap<String,String> map = new HashMap<>();
map.put("contractNum",payIncomeContractStatus.getContractNum());
map.put("contractName",payIncomeContractStatus.getContractName());
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setToUser(p.getUsername());
sendMessageDTO.setTemplateCode(finalCode);
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType(finalType);
JSONObject json = new JSONObject();
json.put("revenueId",payIncomeContractStatus.getId());
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
});
}
}
@Override
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java
+21 -14
View File
@@ -1,6 +1,9 @@
package com.jero.contract.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.HuaWeiSmsUtil;
import com.jero.common.util.PasswordUtil;
@@ -13,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
/**
@@ -23,31 +27,34 @@ import java.util.List;
*/
@Service
public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl<PaySpendingContractInstallmentMapper, PaySpendingContractInstallment> implements IPaySpendingContractInstallmentService {
@Autowired
private HuaWeiSmsUtil huaWeiSmsUtil;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Resource
private SendMessageService sendMessageService;
@Resource
private PaySpendingContractInstallmentMapper paySpendingContractInstallmentMapper;
@Override
public void sendSMSSpendingContract() {
List<PaySpendingContractInstallment> list = paySpendingContractInstallmentMapper.getSpendingContract();
if(!CollectionUtils.isEmpty(list)){
// todo 发短信
list.forEach(p->{
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(p.getPhone())){
String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
+ "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
// huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg);
sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
}
if(!StringUtils.isBlank(p.getEmail())){
String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
+ "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg);
sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
// todo 缺少发消息
HashMap<String,String> map = new HashMap<>();
map.put("contract",p.getContractName());
map.put("num",p.getPhaseName());
map.put("amount", String.valueOf(p.getAccountsReceivableAmount()));
sendMessageDTO.setFromUser("admin");
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG8.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE8");
sendMessageService.SendMessageService(sendMessageDTO);
});
}
}