yeguodong 1 miesiąc temu
rodzic
commit
bd8faf8dd9

+ 1 - 1
src/main/java/thyyxxk/webserver/controller/lc/company/LcCompanyController.java

@@ -43,7 +43,7 @@ public class LcCompanyController {
      * @return
      */
     @PostMapping("/getLcCompanyList")
-    public ResultVo<Page<LcCompany>> getLcCompanyById(@RequestBody LcCompanyParam lcCompanyParam) {
+    public ResultVo<Object> getLcCompanyById(@RequestBody LcCompanyParam lcCompanyParam) {
         return ResultVoUtil.success(companyService.getLcCompanyList(lcCompanyParam));
     }
 

+ 4 - 1
src/main/java/thyyxxk/webserver/dao/his/lc/company/LcCompanyDao.java

@@ -2,10 +2,13 @@ package thyyxxk.webserver.dao.his.lc.company;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import thyyxxk.webserver.entity.lc.company.LcCompany;
 
 @Mapper
 public interface LcCompanyDao extends BaseMapper<LcCompany> {
 
-
+    @Select(" SELECT RIGHT('000' + CAST(MAX(CAST(serial_no AS INT)) + 1 AS VARCHAR(3)), 3) AS next_serial_no FROM lc_company where company_type = #{companyType}")
+    String getSerialNo(@Param("companyType") String companyType);
 }

+ 20 - 3
src/main/java/thyyxxk/webserver/service/lc/company/LcCompanyService.java

@@ -11,6 +11,7 @@ import thyyxxk.webserver.entity.lc.company.LcCompany;
 import thyyxxk.webserver.entity.lc.company.LcCompanyParam;
 import thyyxxk.webserver.entity.lc.purchasePlan.LcPurchasePlanDetail;
 
+import java.util.List;
 import java.util.UUID;
 
 @Slf4j
@@ -24,14 +25,20 @@ public class LcCompanyService {
         return dao.selectById(id);
     }
 
-    public Page<LcCompany> getLcCompanyList(LcCompanyParam lcCompanyParam) {
-        Page<LcCompany> page = new Page<>(lcCompanyParam.getPageNumber(), lcCompanyParam.getPageSize());
+    public Object getLcCompanyList(LcCompanyParam lcCompanyParam) {
         LambdaQueryWrapper<LcCompany> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotBlank(lcCompanyParam.getCompanyName())) {
             queryWrapper.like(LcCompany::getCompanyName, lcCompanyParam.getCompanyName());
         }
 
-        return dao.selectPage(page, queryWrapper);
+        Integer pageNumber = lcCompanyParam.getPageNumber();
+        Integer pageSize = lcCompanyParam.getPageSize();
+        if (pageNumber != null && pageSize != null) {
+            Page<LcCompany> page = new Page<>(pageNumber, pageSize);
+            return dao.selectPage(page, queryWrapper);
+        } else {
+            return dao.selectList(queryWrapper);
+        }
     }
 
     public int insertLcCompany(LcCompany lcCompany) {
@@ -40,6 +47,16 @@ public class LcCompanyService {
             num = dao.updateById(lcCompany);
         } else {
             lcCompany.setId(UUID.randomUUID().toString().replace("-", ""));
+            String serialNo = dao.getSerialNo(lcCompany.getCompanyType());
+            lcCompany.setSerialNo(serialNo);
+            String companyCode = "";
+            if("0".equals(lcCompany.getCompanyType())) {
+                companyCode = "XS0";
+            } else {
+                companyCode = "SC1";
+            }
+            companyCode += serialNo;
+            lcCompany.setCompanyCode(companyCode);
             num = dao.insert(lcCompany);
 
         }