diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java index 468d5f9b..9984fdb7 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java @@ -68,7 +68,6 @@ public class BizSignTypeController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BIZ, title = "", biz = BizType.QUERY) - @PreAuthorize("hasRole('biz:signType:query')") public R getById(@PathVariable("id") String id){ BizSignType bizSignType = bizSignTypeService.getById(id); BizSignTypeVo typeVo = CopierUtil.copy(bizSignType, new BizSignTypeVo()); @@ -93,6 +92,12 @@ public class BizSignTypeController { //@PreAuthorize("hasRole('biz:signType:update')") public R updateById(@RequestBody @Valid BizSignType param){ BizSignType entity = CopierUtil.copy(param,new BizSignType()); + long count = bizSignTypeService.count(new LambdaQueryWrapper() + .eq(BizSignType::getTypeName,param.getTypeName()) + .ne(BizSignType::getId,param.getId())); + if(count>0){ + return R.error("类型的标题不可重复"); + } boolean result = bizSignTypeService.updateById(entity); return R.isTrue(result); } @@ -106,6 +111,11 @@ public class BizSignTypeController { @SysLog(module = SystemModule.BIZ, title = "", biz = BizType.INSERT) public R save(@RequestBody @Valid BizSignType param){ BizSignType entity = CopierUtil.copy(param,new BizSignType()); + long count = bizSignTypeService.count(new LambdaQueryWrapper() + .eq(BizSignType::getTypeName,param.getTypeName())); + if(count>0){ + return R.error("类型的标题不可重复"); + } boolean result = bizSignTypeService.save(entity); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java index cc6f9601..c57ad2f8 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java @@ -67,7 +67,6 @@ public class BizVisitFormController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BIZ, title = "科目表单", biz = BizType.QUERY) - @PreAuthorize("hasRole('biz:visitForm:query')") public R getById(@PathVariable("id") String id){ BizVisitForm bizVisitForm = bizVisitFormService.getById(id); return R.ok(bizVisitForm); diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java index 868e89f8..f41b6ddf 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java @@ -148,13 +148,13 @@ public class BizVisitApi { return R.ok(); } - //自动关联模板ID - BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper() - .eq(BizSignType::getTypeName,param.getSignType())); - if(signType!=null){ - param.setSignTypeId(signType.getId()); - param.setFormId(signType.getTemplateId()); - } +// //自动关联模板ID +// BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper() +// .eq(BizSignType::getTypeName,param.getSignType())); +// if(signType!=null){ +// param.setSignTypeId(signType.getId()); +// param.setFormId(signType.getTemplateId()); +// } boolean result = bizVisitService.updateById(param); return R.isTrue(result); @@ -172,12 +172,12 @@ public class BizVisitApi { return R.ok(); } //自动关联模板ID - BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper() - .eq(BizSignType::getTypeName,param.getSignType())); - if(signType!=null){ - param.setSignTypeId(signType.getId()); - param.setFormId(signType.getTemplateId()); - } +// BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper() +// .eq(BizSignType::getTypeName,param.getSignType())); +// if(signType!=null){ +// param.setSignTypeId(signType.getId()); +// param.setFormId(signType.getTemplateId()); +// } String userId = wxUser.getSysUserId(); SysUser sysUser = sysUserService.getById(userId); diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java b/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java index 54ab9966..fac57358 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java @@ -57,6 +57,9 @@ public class BizVisit implements Serializable { /** 表单ID */ private String formId; + /** 表单标题 */ + private String formTitle; + /** 表单设置 */ private String formSettings; diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizVisitForm.java b/src/main/java/com/qs/serve/modules/biz/entity/BizVisitForm.java index 01e376d7..5ba1f26e 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizVisitForm.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizVisitForm.java @@ -46,7 +46,6 @@ public class BizVisitForm implements Serializable { /** 表单json */ @NotBlank(message = "表单json不能为空") - @Length(max = 0,message = "表单json长度不能超过0字") private String formContext; /** 表单版本 */ diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index c271f74d..3490db58 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -221,5 +221,10 @@ public class GoodsSku implements Serializable { @TableField(exist = false) private String spuName; + /** + * spu名称(用于excel导出) + */ + @TableField(exist = false) + private String name; } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java index 3748df2c..8ab94bc7 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java @@ -441,6 +441,12 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification // vtbVer.setAmount(totalAmount); // vtbVerificationService.updateById(vtbVer); // } + + //更新金额 + VtbVerification vtbVer = new VtbVerification(); + vtbVer.setId(verification.getId()); + vtbVer.setAmount(totalAmount); + vtbVerificationService.updateById(vtbVer); } } } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index c2f6fc5b..0a4c34d2 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -1469,6 +1469,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl and `goods_sku`.`sku_add_code` like concat('%',#{query.skuAddCode},'%') and `goods_spu`.`spu_code` like concat('%',#{query.spuCode},'%') and `goods_spu`.`name` like concat('%',#{query.spuName},'%') + and `goods_spu`.`name` like concat('%',#{query.name},'%') and `goods_sku`.`sku_name` like concat('%',#{query.skuName},'%') and `goods_sku`.`taste_val` like concat('%',#{query.tasteVal},'%') and `goods_sku`.`wrap_val` like concat('%',#{query.wrapVal},'%') diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml index 484cd576..5f3a1140 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml @@ -209,7 +209,7 @@ and `tbs_cost_apply`.`submit_time` = #{query.submitTime} and `tbs_cost_apply`.`pass_time` = #{query.passTime} and `tbs_cost_apply`.`user_id` = #{query.userId} - and `tbs_cost_apply`.`user_code` = #{query.userCode} + and `tbs_cost_apply`.`user_code` like concat('%', #{query.userCode},'%') and `tbs_cost_apply`.`user_name` like concat('%', #{query.userName},'%') and `tbs_cost_apply`.`sy_form_id` = #{query.syFormId} and `tbs_cost_apply`.`sy_flow_id` = #{query.syFlowId}