Browse Source

对接OA调整

mssql
Yen 3 years ago
parent
commit
b4efd7c549
  1. 14
      src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java
  2. 7
      src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java
  3. 3
      src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java
  4. 4
      src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierAddressMapper.java
  5. 2
      src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java
  6. 3
      src/main/java/com/qs/serve/modules/bms/service/BmsSupplierAddressService.java
  7. 11
      src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java
  8. 4
      src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierAddressServiceImpl.java
  9. 1
      src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java
  10. 18
      src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java
  11. 2
      src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java
  12. 22
      src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java
  13. 6
      src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
  14. 8
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
  15. 8
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
  16. 84
      src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml

14
src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java

@ -164,14 +164,12 @@ public class BmsMasterUserController {
List<BmsMasterUser> masterUsers = new ArrayList<>(); List<BmsMasterUser> masterUsers = new ArrayList<>();
for (String userId : param.getUserIds()) { for (String userId : param.getUserIds()) {
for (String targetId : param.getTargetIds()) { for (String targetId : param.getTargetIds()) {
BmsMasterUser masterUser = bmsMasterUserService.getByParam(type,targetId,userId); bmsMasterUserService.removeMgrUser(type,targetId,userId);
if(masterUser == null){ BmsMasterUser masterUser = new BmsMasterUser();
masterUser = new BmsMasterUser(); masterUser.setType(type);
masterUser.setType(type); masterUser.setTargetId(targetId);
masterUser.setTargetId(targetId); masterUser.setUserId(userId);
masterUser.setUserId(userId); masterUsers.add(masterUser);
masterUsers.add(masterUser);
}
} }
} }
bmsMasterUserService.saveBatch(masterUsers); bmsMasterUserService.saveBatch(masterUsers);

7
src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java

@ -44,12 +44,7 @@ public class BmsSupplierAddressController {
@PreAuthorize("hasRole('bms:supplierAddress:query')") @PreAuthorize("hasRole('bms:supplierAddress:query')")
public R<PageVo<BmsSupplierAddress>> getPage(BmsSupplierAddress param){ public R<PageVo<BmsSupplierAddress>> getPage(BmsSupplierAddress param){
PageUtil.startPage(); PageUtil.startPage();
LambdaQueryWrapper<BmsSupplierAddress> supplierAddressWrapper = new LambdaQueryWrapper<>(param); List<BmsSupplierAddress> list = bmsSupplierAddressService.selectBmsSupplierAddressList(param);
List<BmsSupplierAddress> list = bmsSupplierAddressService.list(supplierAddressWrapper);
for (BmsSupplierAddress supplierAddress : list) {
BmsSupplier supplier = bmsSupplierService.getById(supplierAddress.getSupplierId());
supplierAddress.setSupplierName(supplier.getName());
}
return R.byPageHelperList(list); return R.byPageHelperList(list);
} }

3
src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java

@ -117,5 +117,8 @@ public class BmsSupplierAddress implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String supplierName; private String supplierName;
/** 客户编码 */
@TableField(exist = false)
private String supplierCode;
} }

4
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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.bms.entity.BmsSupplierAddress; import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 供应商地址 Mapper * 供应商地址 Mapper
* @author YenHex * @author YenHex
@ -10,5 +12,7 @@ import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
*/ */
public interface BmsSupplierAddressMapper extends BaseMapper<BmsSupplierAddress> { public interface BmsSupplierAddressMapper extends BaseMapper<BmsSupplierAddress> {
List<BmsSupplierAddress> selectBmsSupplierAddressList(@Param("query") BmsSupplierAddress query);
} }

2
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<BmsMasterUser> { public interface BmsMasterUserService extends IService<BmsMasterUser> {
void removeMgrUser(String type, String targetId, String userId);
BmsMasterUser getByParam(String type, String targetId, String userId); BmsMasterUser getByParam(String type, String targetId, String userId);

3
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.baomidou.mybatisplus.extension.service.IService;
import com.qs.serve.modules.bms.entity.BmsSupplierAddress; import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -16,5 +17,7 @@ public interface BmsSupplierAddressService extends IService<BmsSupplierAddress>
List<BmsSupplierAddress> listBySupplierId(Long supplierId); List<BmsSupplierAddress> listBySupplierId(Long supplierId);
List<BmsSupplierAddress> selectBmsSupplierAddressList(BmsSupplierAddress query);
} }

11
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 @AllArgsConstructor
public class BmsMasterUserServiceImpl extends ServiceImpl<BmsMasterUserMapper,BmsMasterUser> implements BmsMasterUserService { public class BmsMasterUserServiceImpl extends ServiceImpl<BmsMasterUserMapper,BmsMasterUser> implements BmsMasterUserService {
@Override
public void removeMgrUser(String type, String targetId, String userId) {
LambdaQueryWrapper<BmsMasterUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(BmsMasterUser::getTargetId,targetId);
lqw.eq(BmsMasterUser::getType,type);
lqw.eq(BmsMasterUser::getUserId,userId);
this.remove(lqw);
}
@Override @Override
public BmsMasterUser getByParam(String type, String targetId, String userId) { public BmsMasterUser getByParam(String type, String targetId, String userId) {
LambdaQueryWrapper<BmsMasterUser> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BmsMasterUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(BmsMasterUser::getTenantId,targetId); lqw.eq(BmsMasterUser::getTargetId,targetId);
lqw.eq(BmsMasterUser::getType,type); lqw.eq(BmsMasterUser::getType,type);
lqw.eq(BmsMasterUser::getUserId,userId); lqw.eq(BmsMasterUser::getUserId,userId);
return this.getOne(lqw,false); return this.getOne(lqw,false);

4
src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierAddressServiceImpl.java

@ -36,5 +36,9 @@ public class BmsSupplierAddressServiceImpl extends ServiceImpl<BmsSupplierAddres
return this.list(lqw); return this.list(lqw);
} }
@Override
public List<BmsSupplierAddress> selectBmsSupplierAddressList(BmsSupplierAddress query) {
return baseMapper.selectBmsSupplierAddressList(query);
}
} }

1
src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java

@ -97,6 +97,7 @@ public class PayPayment implements Serializable {
/** /**
* 取消标识 * 取消标识
* 不再支付列表0-冻结1-解冻 * 不再支付列表0-冻结1-解冻
* 支付列表0-正常1-取消
**/ **/
private Integer cancelFlag; private Integer cancelFlag;

18
src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java

@ -12,10 +12,6 @@ import java.util.List;
@Data @Data
public class CtpAffairQo { public class CtpAffairQo {
List<String> templateCodes;
List<String> templateIds;
String memberId; String memberId;
String formMainId; String formMainId;
@ -29,4 +25,18 @@ public class CtpAffairQo {
Integer pageSize; Integer pageSize;
String viewName;
String templateId;
String applyUserCode;
String applyUserName;
String supplierName;
String supplierCode;
String title;
String rowState;
String startTime;
String endTime;
} }

2
src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java

@ -17,7 +17,7 @@ import java.util.List;
*/ */
public interface SeeYonService { public interface SeeYonService {
R<List<CtpAffair>> commonListAffairs(String syFormId, String tmpCode); R<List<CtpAffair>> commonListAffairs(String syFormId, String templateId, String viewName);
R<String> commonCommit(TbsAffairCommitBo affairCommit,String formCode); R<String> commonCommit(TbsAffairCommitBo affairCommit,String formCode);

22
src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java

@ -39,32 +39,16 @@ public class SeeYonServiceImpl implements SeeYonService {
@Nullable @Nullable
@Override @Override
public R<List<CtpAffair>> commonListAffairs(String syFormId, String tmpCode) { public R<List<CtpAffair>> commonListAffairs(String syFormId, String templateId, String viewName) {
SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
return R.error("当前账号未绑定致远用户信息"); return R.error("当前账号未绑定致远用户信息");
} }
CtpAffairQo param = new CtpAffairQo(); CtpAffairQo param = new CtpAffairQo();
param.setFormMainId(syFormId); param.setFormMainId(syFormId);
param.setTemplateCodes(Arrays.asList(tmpCode)); param.setTemplateId(templateId);
param.setViewName(viewName);
return this.listFormAffair(param); return this.listFormAffair(param);
/*List<CtpAffair> ctpAffairs = syResult.getData();
if(ctpAffairs.size()>0){
List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
List<SysUser> userList = sysUserService.listByOaMemberIds(oaUserIds);
List<CtpAffairVo> 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 @Override

6
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 COST_APPLY_FORM = "CostBill_Test";
String VERIFICATION_FORM = "CheckCost_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_CREATE = "/process/create";
String API_PROCESS_COMMIT = "/process/commit"; String API_PROCESS_COMMIT = "/process/commit";
String API_PROCESS_CANCEL = "/process/cancel"; String API_PROCESS_CANCEL = "/process/cancel";

8
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@ -290,8 +290,9 @@ public class TbsCostApplyController {
if(syFormId==null){ if(syFormId==null){
return R.ok(); return R.ok();
} }
String tmpCode = TbsSeeYonConst.COST_APPLY_FORM; String templateId = TbsSeeYonConst.COST_APPLY_TMP_ID;
R<List<CtpAffair>> syResult = seeYonService.commonListAffairs(syFormId, tmpCode); String viewName = TbsSeeYonConst.COST_APPLY_VIEW;
R<List<CtpAffair>> syResult = seeYonService.commonListAffairs(syFormId,templateId,viewName);
List<CtpAffair> ctpAffairs = syResult.getData(); List<CtpAffair> ctpAffairs = syResult.getData();
if(ctpAffairs.size()>0){ if(ctpAffairs.size()>0){
List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
@ -330,7 +331,8 @@ public class TbsCostApplyController {
param.setState(state); param.setState(state);
param.setPageNum(pageNum); param.setPageNum(pageNum);
param.setPageSize(pageSize); 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<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param); R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
PageVo<CtpAffair> pageVo = syResult.getData(); PageVo<CtpAffair> pageVo = syResult.getData();
List<CtpAffair> ctpAffairs = pageVo.getList(); List<CtpAffair> ctpAffairs = pageVo.getList();

8
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -149,8 +149,9 @@ public class VtbVerificationController {
if(syFormId==null){ if(syFormId==null){
return R.ok(); return R.ok();
} }
String tmpCode = TbsSeeYonConst.VERIFICATION_FORM; String templateId = TbsSeeYonConst.VERIFICATION_TMP_ID;
R<List<CtpAffair>> result = seeYonService.commonListAffairs(syFormId, tmpCode); String viewName = TbsSeeYonConst.VERIFICATION_VIEW;
R<List<CtpAffair>> result = seeYonService.commonListAffairs(syFormId, templateId,viewName);
List<CtpAffairVo> result2 = this.buildCtpAffairVoList(result.getData()); List<CtpAffairVo> result2 = this.buildCtpAffairVoList(result.getData());
return R.ok(result2); return R.ok(result2);
} }
@ -173,7 +174,8 @@ public class VtbVerificationController {
param.setState(state); param.setState(state);
param.setPageNum(pageNum); param.setPageNum(pageNum);
param.setPageSize(pageSize); param.setPageSize(pageSize);
param.setTemplateCodes(Arrays.asList(TbsSeeYonConst.VERIFICATION_FORM)); param.setViewName(TbsSeeYonConst.VERIFICATION_VIEW);
param.setViewName(TbsSeeYonConst.VERIFICATION_TMP_ID);
R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param); R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
PageVo<CtpAffair> pageVo = syResult.getData(); PageVo<CtpAffair> pageVo = syResult.getData();
List<CtpAffair> ctpAffairs = pageVo.getList(); List<CtpAffair> ctpAffairs = pageVo.getList();

84
src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qs.serve.modules.bms.mapper.BmsSupplierAddressMapper">
<resultMap id="bmsSupplierAddressMap" type="com.qs.serve.modules.bms.entity.BmsSupplierAddress" >
<result property="id" column="id"/>
<result property="supplierId" column="supplier_id"/>
<result property="defaultFlag" column="default_flag"/>
<result property="provinceCode" column="province_code"/>
<result property="province" column="province"/>
<result property="cityCode" column="city_code"/>
<result property="city" column="city"/>
<result property="areaCode" column="area_code"/>
<result property="area" column="area"/>
<result property="detail" column="detail"/>
<result property="phone" column="phone"/>
<result property="receiver" column="receiver"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="tenantId" column="tenant_id"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="supplierName" column="supplier_name"/>
<result property="supplierCode" column="supplier_code"/>
</resultMap>
<sql id="bmsSupplierAddressSql">
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` </sql>
<select id="selectBmsSupplierAddressList" parameterType="com.qs.serve.modules.bms.entity.BmsSupplierAddress" resultMap="bmsSupplierAddressMap">
SELECT
<include refid="bmsSupplierAddressSql"/>
FROM `bms_supplier_address` `bms_supplier_address`
left join `bms_supplier` `bms_supplier` on `bms_supplier`.id = `bms_supplier_address`.`supplier_id`
<where>
<if test="query.id != null"> and `bms_supplier_address`.`id` = #{query.id}</if>
<if test="query.supplierId != null"> and `bms_supplier_address`.`supplier_id` = #{query.supplierId}</if>
<if test="query.defaultFlag != null"> and `bms_supplier_address`.`default_flag` = #{query.defaultFlag}</if>
<if test="query.provinceCode != null and query.provinceCode != ''"> and `bms_supplier_address`.`province_code` = #{query.provinceCode}</if>
<if test="query.province != null and query.province != ''"> and `bms_supplier_address`.`province` like concat('%',#{query.province},'%') </if>
<if test="query.cityCode != null and query.cityCode != ''"> and `bms_supplier_address`.`city_code` = #{query.cityCode}</if>
<if test="query.city != null and query.city != ''"> and `bms_supplier_address`.`city` like concat('%',#{query.city},'%') </if>
<if test="query.areaCode != null and query.areaCode != ''"> and `bms_supplier_address`.`area_code` like concat('%',#{query.areaCode},'%') </if>
<if test="query.area != null and query.area != ''"> and `bms_supplier_address`.`area` like concat('%',#{query.area},'%') </if>
<if test="query.detail != null and query.detail != ''"> and `bms_supplier_address`.`detail` = #{query.detail}</if>
<if test="query.phone != null and query.phone != ''"> and `bms_supplier_address`.`phone` = #{query.phone}</if>
<if test="query.receiver != null and query.receiver != ''"> and `bms_supplier_address`.`receiver` = #{query.receiver}</if>
<if test="query.remark != null and query.remark != ''"> and `bms_supplier_address`.`remark` = #{query.remark}</if>
<if test="query.createTime != null"> and `bms_supplier_address`.`create_time` = #{query.createTime}</if>
<if test="query.updateTime != null"> and `bms_supplier_address`.`update_time` = #{query.updateTime}</if>
<if test="query.tenantId != null and query.tenantId != ''"> and `bms_supplier_address`.`tenant_id` = #{query.tenantId}</if>
<if test="query.delFlag != null and query.delFlag != ''"> and `bms_supplier_address`.`del_flag` = #{query.delFlag}</if>
<if test="query.createBy != null and query.createBy != ''"> and `bms_supplier_address`.`create_by` = #{query.createBy}</if>
<if test="query.updateBy != null and query.updateBy != ''"> and `bms_supplier_address`.`update_by` = #{query.updateBy}</if>
<if test="query.supplierName != null and query.supplierName != ''"> and `bms_supplier`.`name` like concat('%',#{query.supplierName},'%')</if>
<if test="query.supplierCode != null and query.supplierCode != ''"> and `bms_supplier`.`code` like concat('%',#{query.supplierCode},'%')</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save