From b4efd7c5490878d57f23b9590b3751959db56d23 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 16 Jan 2023 16:47:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5OA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmsMasterUserController.java | 14 ++-- .../BmsSupplierAddressController.java | 7 +- .../bms/entity/BmsSupplierAddress.java | 3 + .../bms/mapper/BmsSupplierAddressMapper.java | 4 + .../bms/service/BmsMasterUserService.java | 2 +- .../service/BmsSupplierAddressService.java | 3 + .../impl/BmsMasterUserServiceImpl.java | 11 ++- .../impl/BmsSupplierAddressServiceImpl.java | 4 + .../serve/modules/pay/entity/PayPayment.java | 1 + .../modules/seeyon/entity/CtpAffairQo.java | 18 +++- .../modules/seeyon/service/SeeYonService.java | 2 +- .../service/impl/SeeYonServiceImpl.java | 22 +---- .../modules/tbs/common/TbsSeeYonConst.java | 6 ++ .../controller/TbsCostApplyController.java | 8 +- .../controller/VtbVerificationController.java | 8 +- .../mapper/bms/BmsSupplierAddressMapper.xml | 84 +++++++++++++++++++ 16 files changed, 151 insertions(+), 46 deletions(-) create mode 100644 src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java index 8c0f92e1..1020f180 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java @@ -164,14 +164,12 @@ public class BmsMasterUserController { List masterUsers = new ArrayList<>(); for (String userId : param.getUserIds()) { for (String targetId : param.getTargetIds()) { - BmsMasterUser masterUser = bmsMasterUserService.getByParam(type,targetId,userId); - if(masterUser == null){ - masterUser = new BmsMasterUser(); - masterUser.setType(type); - masterUser.setTargetId(targetId); - masterUser.setUserId(userId); - masterUsers.add(masterUser); - } + bmsMasterUserService.removeMgrUser(type,targetId,userId); + BmsMasterUser masterUser = new BmsMasterUser(); + masterUser.setType(type); + masterUser.setTargetId(targetId); + masterUser.setUserId(userId); + masterUsers.add(masterUser); } } bmsMasterUserService.saveBatch(masterUsers); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java index 33b92c9c..7d2a6a13 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java @@ -44,12 +44,7 @@ public class BmsSupplierAddressController { @PreAuthorize("hasRole('bms:supplierAddress:query')") public R> getPage(BmsSupplierAddress param){ PageUtil.startPage(); - LambdaQueryWrapper supplierAddressWrapper = new LambdaQueryWrapper<>(param); - List list = bmsSupplierAddressService.list(supplierAddressWrapper); - for (BmsSupplierAddress supplierAddress : list) { - BmsSupplier supplier = bmsSupplierService.getById(supplierAddress.getSupplierId()); - supplierAddress.setSupplierName(supplier.getName()); - } + List list = bmsSupplierAddressService.selectBmsSupplierAddressList(param); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java index fa55511f..4df246f3 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java @@ -117,5 +117,8 @@ public class BmsSupplierAddress implements Serializable { @TableField(exist = false) private String supplierName; + /** 客户编码 */ + @TableField(exist = false) + private String supplierCode; } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierAddressMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierAddressMapper.java index f7b63967..5017838d 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierAddressMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierAddressMapper.java @@ -2,7 +2,9 @@ package com.qs.serve.modules.bms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bms.entity.BmsSupplierAddress; +import org.apache.ibatis.annotations.Param; +import java.util.List; /** * 供应商地址 Mapper * @author YenHex @@ -10,5 +12,7 @@ import com.qs.serve.modules.bms.entity.BmsSupplierAddress; */ public interface BmsSupplierAddressMapper extends BaseMapper { + List selectBmsSupplierAddressList(@Param("query") BmsSupplierAddress query); + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java index 59cbac6b..108f6a17 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java @@ -11,7 +11,7 @@ import com.qs.serve.modules.bms.entity.BmsRegionUser; */ public interface BmsMasterUserService extends IService { - + void removeMgrUser(String type, String targetId, String userId); BmsMasterUser getByParam(String type, String targetId, String userId); diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierAddressService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierAddressService.java index 5cb4469d..9c628407 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierAddressService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierAddressService.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.bms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.bms.entity.BmsSupplierAddress; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,5 +17,7 @@ public interface BmsSupplierAddressService extends IService List listBySupplierId(Long supplierId); + List selectBmsSupplierAddressList(BmsSupplierAddress query); + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java index 5d0b514e..32b01299 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java @@ -20,10 +20,19 @@ import com.qs.serve.modules.bms.mapper.BmsMasterUserMapper; @AllArgsConstructor public class BmsMasterUserServiceImpl extends ServiceImpl implements BmsMasterUserService { + @Override + public void removeMgrUser(String type, String targetId, String userId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsMasterUser::getTargetId,targetId); + lqw.eq(BmsMasterUser::getType,type); + lqw.eq(BmsMasterUser::getUserId,userId); + this.remove(lqw); + } + @Override public BmsMasterUser getByParam(String type, String targetId, String userId) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(BmsMasterUser::getTenantId,targetId); + lqw.eq(BmsMasterUser::getTargetId,targetId); lqw.eq(BmsMasterUser::getType,type); lqw.eq(BmsMasterUser::getUserId,userId); return this.getOne(lqw,false); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierAddressServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierAddressServiceImpl.java index 78877f5b..285112f0 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierAddressServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierAddressServiceImpl.java @@ -36,5 +36,9 @@ public class BmsSupplierAddressServiceImpl extends ServiceImpl selectBmsSupplierAddressList(BmsSupplierAddress query) { + return baseMapper.selectBmsSupplierAddressList(query); + } } diff --git a/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java b/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java index 2792abbc..c9bd4307 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java @@ -97,6 +97,7 @@ public class PayPayment implements Serializable { /** * 取消标识 * 不再支付列表：0-冻结；1-解冻 + * 支付列表：0-正常；1-取消 **/ private Integer cancelFlag; diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java index ccff5966..30617055 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java @@ -12,10 +12,6 @@ import java.util.List; @Data public class CtpAffairQo { - List templateCodes; - - List templateIds; - String memberId; String formMainId; @@ -29,4 +25,18 @@ public class CtpAffairQo { Integer pageSize; + String viewName; + String templateId; + + + String applyUserCode; + String applyUserName; + String supplierName; + String supplierCode; + String title; + String rowState; + + String startTime; + String endTime; + } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java index 02860c60..eafa651c 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface SeeYonService { - R> commonListAffairs(String syFormId, String tmpCode); + R> commonListAffairs(String syFormId, String templateId, String viewName); R commonCommit(TbsAffairCommitBo affairCommit,String formCode); diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index e8858a17..a170ce60 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -39,32 +39,16 @@ public class SeeYonServiceImpl implements SeeYonService { @Nullable @Override - public R> commonListAffairs(String syFormId, String tmpCode) { + public R> commonListAffairs(String syFormId, String templateId, String viewName) { SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ return R.error("当前账号未绑定致远用户信息"); } CtpAffairQo param = new CtpAffairQo(); param.setFormMainId(syFormId); - param.setTemplateCodes(Arrays.asList(tmpCode)); + param.setTemplateId(templateId); + param.setViewName(viewName); return this.listFormAffair(param); - /*List ctpAffairs = syResult.getData(); - if(ctpAffairs.size()>0){ - List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); - List userList = sysUserService.listByOaMemberIds(oaUserIds); - List result = new ArrayList<>(); - for (CtpAffair ctpAffair : ctpAffairs) { - CtpAffairVo ctpAffairVo = new CtpAffairVo(); - ctpAffairVo.setAffairInfo(ctpAffair); - for (SysUser user : userList) { - if(ctpAffair.getMemberId().equals(user.getSyUserId())){ - ctpAffairVo.setUserInfo(user.toSysUserVo()); - } - } - result.add(ctpAffairVo); - } - return R.ok(result); - }*/ } @Override diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 56fc3275..a1adb7e9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -12,6 +12,12 @@ public interface TbsSeeYonConst { String COST_APPLY_FORM = "CostBill_Test"; String VERIFICATION_FORM = "CheckCost_Test"; + String VERIFICATION_TMP_ID = ""; + String VERIFICATION_VIEW = ""; + + String COST_APPLY_TMP_ID = ""; + String COST_APPLY_VIEW = ""; + String API_PROCESS_CREATE = "/process/create"; String API_PROCESS_COMMIT = "/process/commit"; String API_PROCESS_CANCEL = "/process/cancel"; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 4a0b9046..df374de4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -290,8 +290,9 @@ public class TbsCostApplyController { if(syFormId==null){ return R.ok(); } - String tmpCode = TbsSeeYonConst.COST_APPLY_FORM; - R> syResult = seeYonService.commonListAffairs(syFormId, tmpCode); + String templateId = TbsSeeYonConst.COST_APPLY_TMP_ID; + String viewName = TbsSeeYonConst.COST_APPLY_VIEW; + R> syResult = seeYonService.commonListAffairs(syFormId,templateId,viewName); List ctpAffairs = syResult.getData(); if(ctpAffairs.size()>0){ List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); @@ -330,7 +331,8 @@ public class TbsCostApplyController { param.setState(state); param.setPageNum(pageNum); param.setPageSize(pageSize); - param.setTemplateCodes(Arrays.asList(TbsSeeYonConst.COST_APPLY_FORM)); + param.setTemplateId(TbsSeeYonConst.COST_APPLY_TMP_ID); + param.setViewName(TbsSeeYonConst.COST_APPLY_VIEW); R> syResult = seeYonService.pageMemberAffair(param); PageVo pageVo = syResult.getData(); List ctpAffairs = pageVo.getList(); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 9c788af2..351c5740 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -149,8 +149,9 @@ public class VtbVerificationController { if(syFormId==null){ return R.ok(); } - String tmpCode = TbsSeeYonConst.VERIFICATION_FORM; - R> result = seeYonService.commonListAffairs(syFormId, tmpCode); + String templateId = TbsSeeYonConst.VERIFICATION_TMP_ID; + String viewName = TbsSeeYonConst.VERIFICATION_VIEW; + R> result = seeYonService.commonListAffairs(syFormId, templateId,viewName); List result2 = this.buildCtpAffairVoList(result.getData()); return R.ok(result2); } @@ -173,7 +174,8 @@ public class VtbVerificationController { param.setState(state); param.setPageNum(pageNum); param.setPageSize(pageSize); - param.setTemplateCodes(Arrays.asList(TbsSeeYonConst.VERIFICATION_FORM)); + param.setViewName(TbsSeeYonConst.VERIFICATION_VIEW); + param.setViewName(TbsSeeYonConst.VERIFICATION_TMP_ID); R> syResult = seeYonService.pageMemberAffair(param); PageVo pageVo = syResult.getData(); List ctpAffairs = pageVo.getList(); diff --git a/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml b/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml new file mode 100644 index 00000000..4c188652 --- /dev/null +++ b/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bms_supplier.name as supplier_name, + bms_supplier.code as supplier_code, + bms_supplier_address.`id`, + bms_supplier_address.`supplier_id`, + bms_supplier_address.`default_flag`, + bms_supplier_address.`province_code`, + bms_supplier_address.`province`, + bms_supplier_address.`city_code`, + bms_supplier_address.`city`, + bms_supplier_address.`area_code`, + bms_supplier_address.`area`, + bms_supplier_address.`detail`, + bms_supplier_address.`phone`, + bms_supplier_address.`receiver`, + bms_supplier_address.`remark`, + bms_supplier_address.`create_time`, + bms_supplier_address.`update_time`, + bms_supplier_address.`tenant_id`, + bms_supplier_address.`del_flag`, + bms_supplier_address.`create_by`, + bms_supplier_address.`update_by` + + + +