bugfix

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -57,6 +57,12 @@
           <if test="status != null">
               and a.status = #{status}
           </if>
+            <if test="charging != null">
+                and a.charging = #{charging}
+            </if>
+            <if test="signingWay != null">
+                and a.signing_way = #{signingWay}
+            </if>
           <if test="keywords != null and keywords != ''">
               and (b.firm_name like concat('%', #{keywords}, '%') or
                    e.firm_name like concat('%', #{keywords}, '%') or

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -78,9 +78,6 @@
         <if test="signingWay != null">
             and a.signing_way = #{signingWay}
         </if>
-        <if test="charging != null">
-            and a.charging = #{charging}
-        </if>
         <if test="targetEntId != null">
             and e.ent_id = #{targetEntId}
         </if>

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/controller/KwoBannerController.java

@@ -32,7 +32,7 @@ public class KwoBannerController {
      * @date: 2023/8/28
      */
     @PostMapping("/queryByPage")
-    public HttpResult queryByPage(@RequestBody BannerQueryReqVo reqVo) throws SystemException {
+    public HttpResult queryByPage(@RequestBody BannerQueryReqVo reqVo) {
         return HttpResult.ok(bannerService.queryByPage(reqVo));
     }
 
@@ -44,7 +44,7 @@ public class KwoBannerController {
      * @date: 2023/8/28
      */
     @PostMapping("/add")
-    public HttpResult add(@Valid @RequestBody BannerAddReqVo reqVo) throws SystemException {
+    public HttpResult add(@Valid @RequestBody BannerAddReqVo reqVo) {
         bannerService.addService(reqVo);
         return HttpResult.ok(HttpStatus.MSG_003);
     }
@@ -57,7 +57,7 @@ public class KwoBannerController {
      * @date: 2023/8/28
      */
     @PostMapping("/update")
-    public HttpResult update(@Valid @RequestBody BannerAddReqVo reqVo) throws SystemException {
+    public HttpResult update(@Valid @RequestBody BannerAddReqVo reqVo) {
         bannerService.udpateService(reqVo);
         return HttpResult.ok(HttpStatus.MSG_005);
     }
@@ -70,7 +70,7 @@ public class KwoBannerController {
      * @date: 2023/8/28
      */
     @PostMapping("/delete")
-    public HttpResult delete(@Valid @RequestBody IdsReqVo reqVo) throws SystemException {
+    public HttpResult delete(@Valid @RequestBody IdsReqVo reqVo) {
         bannerService.deleteServer(reqVo.getIds());
         return HttpResult.ok(HttpStatus.MSG_008);
     }
@@ -83,7 +83,7 @@ public class KwoBannerController {
      * @date: 2023/8/28
      */
     @PostMapping("detail")
-    public HttpResult detail(@RequestBody IdsReqVo reqVo) throws SystemException {
+    public HttpResult detail(@RequestBody IdsReqVo reqVo) {
         return HttpResult.ok(bannerService.detailServer(reqVo.getId()));
     }
     /**
@@ -93,7 +93,7 @@ public class KwoBannerController {
      * @date: 2023/9/12
      */
     @PostMapping("/getCategory")
-    public HttpResult getCategory() throws SystemException {
+    public HttpResult getCategory() {
         return HttpResult.ok(bannerService.getCategory());
     }
 
@@ -105,7 +105,7 @@ public class KwoBannerController {
      * @date: 2023/8/28
      */
     @PostMapping("/updateStatus")
-    public HttpResult updateStatus(@Valid @RequestBody BannerUpdateStatusReqVo reqVo) throws SystemException {
+    public HttpResult updateStatus(@Valid @RequestBody BannerUpdateStatusReqVo reqVo) {
         bannerService.updateStatusServer(reqVo);
         return HttpResult.ok(HttpStatus.MSG_005);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/SysDictDao.java

@@ -73,7 +73,7 @@ public interface SysDictDao {
      * @author: czh
      * @date: 2023/7/7
      */
-    SysDict queryUnitDict(@Param(value = "dictTypeId") Long dictTypeId, @Param(value = "value") String value, @Param(value = "label") String label);
+    SysDict queryUnitDict(@Param(value = "dictTypeId") Long dictTypeId, @Param(value = "value") String value, @Param(value = "label") String label, @Param(value = "parentId") String parentId);
 
     /**
      * @param type 类型 value key

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -381,6 +381,15 @@ public class KwsEnterpriseService {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
 
+        if(SystemTypeEnum.MANAGE.getCode().equals(LoginUserHolder.getSystemType())) {
+            ApprovalReqVo approvalReqVo = new ApprovalReqVo();
+            approvalReqVo.setEntId(entId);
+            approvalReqVo.setStatus(ApprovalEnum.OK.getCode());
+            approvalReqVo.setRemark("");
+            approval(approvalReqVo);
+        }
+
+
         //子公司不用新建机构、角色等，直接返回
         Map<String, Object> map = new HashMap<>();
         map.put("entName", kwsEnterprise.getFirmName());

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/SysDictService.java

@@ -95,7 +95,7 @@ public class SysDictService {
      * @desc: 添加新纪录
      */
     public void add(SysDict params) {
-        checkDict(params.getDictId(), params.getValue(), params.getLabel());
+        checkDict(params.getDictId(), params.getValue(), params.getLabel(), params.getParentId());
         if (sysDictDao.insert(params) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
@@ -107,8 +107,8 @@ public class SysDictService {
      * @author: czh
      * @date: 2023/7/7
      */
-    public void checkDict(Long dictTypeId, String value, String label) {
-        SysDict sysDict = sysDictDao.queryUnitDict(dictTypeId, value, label);
+    public void checkDict(Long dictTypeId, String value, String label, String parentId) {
+        SysDict sysDict = sysDictDao.queryUnitDict(dictTypeId, value, label, parentId);
         if (!Objects.isNull(sysDict)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.DICT_EXISTS);
         }
@@ -145,7 +145,7 @@ public class SysDictService {
      * @date: 2023/7/7
      */
     public void update(SysDict params) {
-        checkDict(params.getDictId(), params.getValue(), params.getLabel());
+        checkDict(params.getDictId(), params.getValue(), params.getLabel(), params.getParentId());
         if (sysDictDao.update(params) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }

sckw-modules/sckw-system/src/main/resources/mapper/SysDictDao.xml

@@ -231,6 +231,7 @@
       from sys_dict
      where del_flag = 0
        and dict_id = #{dictTypeId}
+       and parent_id = #{parentId}
        and (value = #{value} or label = #{label})
   </select>