feat: 拜访调整；fix：核销异常修复

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<BizSignTypeVo> 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<BizSignType>()
+                .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<BizSignType>()
+                .eq(BizSignType::getTypeName,param.getTypeName()));
+        if(count>0){
+            return R.error("类型的标题不可重复");
+        }
         boolean result = bizSignTypeService.save(entity);
         return R.isTrue(result);
     }

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<BizVisitForm> getById(@PathVariable("id") String id){
         BizVisitForm bizVisitForm = bizVisitFormService.getById(id);
         return R.ok(bizVisitForm);

src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java

@@ -148,13 +148,13 @@ public class BizVisitApi {
             return R.ok();
         }
 
-        //自动关联模板ID
+//        //自动关联模板ID
-        BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper<BizSignType>()
+//        BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper<BizSignType>()
-                .eq(BizSignType::getTypeName,param.getSignType()));
+//                .eq(BizSignType::getTypeName,param.getSignType()));
-        if(signType!=null){
+//        if(signType!=null){
-            param.setSignTypeId(signType.getId());
+//            param.setSignTypeId(signType.getId());
-            param.setFormId(signType.getTemplateId());
+//            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<BizSignType>()
+//        BizSignType signType = bizSignTypeService.getOne(new LambdaQueryWrapper<BizSignType>()
-                .eq(BizSignType::getTypeName,param.getSignType()));
+//                .eq(BizSignType::getTypeName,param.getSignType()));
-        if(signType!=null){
+//        if(signType!=null){
-            param.setSignTypeId(signType.getId());
+//            param.setSignTypeId(signType.getId());
-            param.setFormId(signType.getTemplateId());
+//            param.setFormId(signType.getTemplateId());
-        }
+//        }
 
         String userId = wxUser.getSysUserId();
         SysUser sysUser = sysUserService.getById(userId);

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;
 

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;
 
     /** 表单版本 */

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;
 }
 

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);
             }
         }
     }

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -1469,6 +1469,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             supplier.setName(activity.getSupplierName());
             //测试单号
             boolean isDevData = verification.getVerificationCode().contains("TEST");
+
             //协议类的核销，不需要调用支付接口
             if(!costApply.getContractFlag().equals(1)
                     && toPay

src/main/resources/mapper/goods/GoodsSkuMapper.xml

@@ -165,6 +165,7 @@
             <if test="query.skuAddCode != null and query.skuAddCode != ''"> and `goods_sku`.`sku_add_code` like concat('%',#{query.skuAddCode},'%') </if>
             <if test="query.spuCode != null and query.spuCode != ''"> and `goods_spu`.`spu_code` like concat('%',#{query.spuCode},'%') </if>
             <if test="query.spuName != null and query.spuName != ''"> and `goods_spu`.`name` like concat('%',#{query.spuName},'%') </if>
+            <if test="query.name != null and query.name != ''"> and `goods_spu`.`name` like concat('%',#{query.name},'%') </if>
             <if test="query.skuName != null and query.skuName != ''"> and `goods_sku`.`sku_name` like concat('%',#{query.skuName},'%') </if>
             <if test="query.tasteVal != null and query.tasteVal != ''"> and `goods_sku`.`taste_val` like concat('%',#{query.tasteVal},'%') </if>
             <if test="query.wrapVal != null and query.wrapVal != ''"> and `goods_sku`.`wrap_val` like concat('%',#{query.wrapVal},'%') </if>

src/main/resources/mapper/tbs/TbsCostApplyMapper.xml

@@ -209,7 +209,7 @@
         <if test="query.submitTime != null"> and `tbs_cost_apply`.`submit_time` = #{query.submitTime}</if>
         <if test="query.passTime != null"> and `tbs_cost_apply`.`pass_time` = #{query.passTime}</if>
         <if test="query.userId != null and query.userId != ''"> and `tbs_cost_apply`.`user_id` = #{query.userId}</if>
-        <if test="query.userCode != null and query.userCode != ''"> and `tbs_cost_apply`.`user_code` = #{query.userCode}</if>
+        <if test="query.userCode != null and query.userCode != ''"> and `tbs_cost_apply`.`user_code` like concat('%', #{query.userCode},'%') </if>
         <if test="query.userName != null and query.userName != ''"> and `tbs_cost_apply`.`user_name` like concat('%', #{query.userName},'%')</if>
         <if test="query.syFormId != null and query.syFormId != ''"> and `tbs_cost_apply`.`sy_form_id` = #{query.syFormId}</if>
         <if test="query.syFlowId != null and query.syFlowId != ''"> and `tbs_cost_apply`.`sy_flow_id` = #{query.syFlowId}</if>