核注核放bug修改

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/BizDictService.java

@@ -68,4 +68,6 @@ public interface BizDictService extends IService<BizDict> {
      * @date 2022/4/24 21:18
      */
     BizDict queryEntity(String id);
+
+    String getNameByType(String dataType,String dataValue);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java

@@ -154,4 +154,30 @@ public class BizDictServiceImpl extends ServiceImpl<BizDictMapper, BizDict> impl
             return null;
         });
     }
+
+    /**
+     * 根据字典类型和字典值查询名称
+     * @param dataType
+     * @param dataValue
+     * @return
+     */
+    @Override
+    public String getNameByType(String dataType,String dataValue){
+        QueryWrapper<BizDict> queryWrapper = new QueryWrapper<BizDict>().checkSqlInjection();
+        queryWrapper.lambda()
+                .eq(BizDict::getDictValue,dataType)
+                .eq(BizDict::getParentId,"0");
+        BizDict bizDict = this.getOne(queryWrapper);
+        if(bizDict != null){
+            QueryWrapper<BizDict> dataQuery = new QueryWrapper<BizDict>().checkSqlInjection();
+            dataQuery.lambda()
+                    .eq(BizDict::getParentId,bizDict.getParentId())
+                    .eq(BizDict::getDictValue,dataType);
+            BizDict dataBizDict = this.getOne(dataQuery);
+            if(dataBizDict != null){
+                return dataBizDict.getDictLabel();
+            }
+        }
+        return "";
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/service/impl/QySecondlineHfdServiceImpl.java

@@ -87,7 +87,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
     public Page<QySecondlineHfd> page(QySecondlineHfdPageParam qySecondlineHfdPageParam) {
         QueryWrapper<QySecondlineHfd> queryWrapper = new QueryWrapper<QySecondlineHfd>().checkSqlInjection();
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getIds())) {
-            queryWrapper.lambda().eq(QySecondlineHfd::getId, qySecondlineHfdPageParam.getIds());
+            queryWrapper.lambda().in(QySecondlineHfd::getId, qySecondlineHfdPageParam.getIds());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getSblx())) {
             queryWrapper.lambda().eq(QySecondlineHfd::getSblx, qySecondlineHfdPageParam.getSblx());
@@ -108,16 +108,18 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
             queryWrapper.lambda().eq(QySecondlineHfd::getStatus, qySecondlineHfdPageParam.getStatus());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdrCode())) {
-            queryWrapper.lambda().eq(QySecondlineHfd::getHfdrCode, qySecondlineHfdPageParam.getHfdrCode());
+            queryWrapper.lambda().like(QySecondlineHfd::getHfdrCode, qySecondlineHfdPageParam.getHfdrCode());
         }
         if(ObjectUtil.isAllNotEmpty(qySecondlineHfdPageParam.getSortField(), qySecondlineHfdPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(qySecondlineHfdPageParam.getSortOrder());
             queryWrapper.orderBy(true, qySecondlineHfdPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(qySecondlineHfdPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(QySecondlineHfd::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHfd::getSblx);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QySecondlineHfd> defaultPage = CommonPageRequest.defaultPage();
+        defaultPage.setSize(Integer.MAX_VALUE);
+        return this.page(defaultPage, queryWrapper);
     }
 
 
@@ -252,6 +254,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         qySecondlineHfdListSh.setCheckTime(date);
         qySecondlineHfdListSh.setStatus("审核通过");
         qySecondlineHfdListSh.setApplyMan(nickname);
+        qySecondlineHfdListSh.setApplicant(nickname);
         qySecondlineHfdListSh.setResult("提交成功，审核通过");
         qySecondlineHfdListSh.setApplyType(applyTypeName);
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/impl/QySecondlineHzdTzServiceImpl.java

@@ -92,7 +92,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
             queryWrapper.lambda().like(QySecondlineHzdTz::getTzCode, qySecondlineHzdTzPageParam.getTzCode());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzType())) {
-            queryWrapper.lambda().eq(QySecondlineHzdTz::getTzType, qySecondlineHzdTzPageParam.getTzType());
+            queryWrapper.lambda().like(QySecondlineHzdTz::getTzType, qySecondlineHzdTzPageParam.getTzType());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getHgHzdCode())) {
             queryWrapper.lambda().like(QySecondlineHzdTz::getHgHzdCode, qySecondlineHzdTzPageParam.getHgHzdCode());
@@ -122,9 +122,11 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
             queryWrapper.orderBy(true, qySecondlineHzdTzPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(qySecondlineHzdTzPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(QySecondlineHzdTz::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHzdTz::getSbsj);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QySecondlineHzdTz> objectPage = CommonPageRequest.defaultPage();
+        objectPage.setSize(Integer.MAX_VALUE);
+        return this.page(objectPage, queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -187,6 +189,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         qySecondlineHzdListSh.setCheckTime(date);
         qySecondlineHzdListSh.setStatus("审核通过");
         qySecondlineHzdListSh.setApplyMan(nickname);
+        qySecondlineHzdListSh.setApplicant(nickname);
         qySecondlineHzdListSh.setResult("提交成功，审核通过");
         qySecondlineHzdListSh.setApplyType(applyTypeName);
 
@@ -203,7 +206,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         if(CollectionUtil.isNotEmpty(productList)){
             List<QySecondlineHzdProduct> products = productList.stream().map(x -> {
                 QySecondlineHzdProduct qySecondlineHfdProduct = BeanUtil.toBean(x, QySecondlineHzdProduct.class);
-                x.setHzdId(hzdId);
+                qySecondlineHfdProduct.setHzdId(hzdId);
                 return qySecondlineHfdProduct;
             }).toList();
             qySecondlineHzdProductService.saveBatch(products);