Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/CrkxxController.java

@@ -40,14 +40,14 @@ public class CrkxxController {
 
     @PostMapping("/create")
     @Operation(summary = "创建出入库信息")
-    @PreAuthorize("@ss.hasPermission('delivery:crkxx:create')")
+    @PreAuthorize("@ss.hasPermission('coding:crkxx:create')")
     public CommonResult<Long> createCrkxx(@Valid @RequestBody CrkxxSaveReqVO createReqVO) {
         return success(crkxxService.createCrkxx(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新出入库信息")
-    @PreAuthorize("@ss.hasPermission('delivery:crkxx:update')")
+    @PreAuthorize("@ss.hasPermission('coding:crkxx:update')")
     public CommonResult<Boolean> updateCrkxx(@Valid @RequestBody CrkxxSaveReqVO updateReqVO) {
         crkxxService.updateCrkxx(updateReqVO);
         return success(true);
@@ -56,7 +56,7 @@ public class CrkxxController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除出入库信息")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('delivery:crkxx:delete')")
+    @PreAuthorize("@ss.hasPermission('coding:crkxx:delete')")
     public CommonResult<Boolean> deleteCrkxx(@RequestParam("id") Long id) {
         crkxxService.deleteCrkxx(id);
         return success(true);
@@ -65,7 +65,7 @@ public class CrkxxController {
     @GetMapping("/get")
     @Operation(summary = "获得出入库信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('delivery:crkxx:query')")
+    @PreAuthorize("@ss.hasPermission('coding:crkxx:query')")
     public CommonResult<CrkxxRespVO> getCrkxx(@RequestParam("id") Long id) {
         CrkxxDO crkxx = crkxxService.getCrkxx(id);
         CrkxxRespVO respVO = BeanUtils.toBean(crkxx, CrkxxRespVO.class);
@@ -74,7 +74,7 @@ public class CrkxxController {
 
     @PostMapping("/page")
     @Operation(summary = "获得出入库信息分页")
-    @PreAuthorize("@ss.hasPermission('delivery:crkxx:query')")
+    @PreAuthorize("@ss.hasPermission('coding:crkxx:query')")
     public CommonResult<PageResult<CrkxxRespVO>> getCrkxxPage(@Valid  @RequestBody CrkxxPageReqVO pageReqVO) {
         PageResult<CrkxxDO> pageResult = crkxxService.getCrkxxPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, CrkxxRespVO.class));
@@ -82,7 +82,7 @@ public class CrkxxController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出出入库信息 Excel")
-    @PreAuthorize("@ss.hasPermission('delivery:crkxx:export')")
+    @PreAuthorize("@ss.hasPermission('coding:crkxx:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportCrkxxExcel(@Valid CrkxxPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxSaveReqVO.java

@@ -2,6 +2,9 @@ package com.unis.module.coding.controller.admin.crkxx.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
 import java.util.*;
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
@@ -40,13 +43,13 @@ public class CrkxxSaveReqVO {
     private String ysgj;
 
     @Schema(description = "入门时间")
-    private LocalDateTime rmsj;
+    private ZonedDateTime rmsj;
 
     @Schema(description = "登记人员")
     private String djry;
 
     @Schema(description = "出门时间")
-    private LocalDateTime cmsj;
+    private ZonedDateTime cmsj;
 
     @Schema(description = "仓房id(DELIVERY_CAXX.ID)", example = "873")
     private Long cfId;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/lqjcxx/LqjcxxController.java

@@ -67,10 +67,7 @@ public class LqjcxxController {
     @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:querybycdandhwk')")
     public CommonResult<LqjcxxRespVO> getLqjcxxByCfId(@RequestParam("cfId") Long cfId) {
         LqjcxxDO lqjcxx = lqjcxxService.getLqjcxxByCfId(cfId);
-        //粮情检测图片 str->list
-//        List<String> list = KQBMUtils.strToList(lqjcxx.getFileIds());
         LqjcxxRespVO lqjcxxRespVO = BeanUtils.toBean(lqjcxx, LqjcxxRespVO.class);
-//        lqjcxxRespVO.setFileIds(list);
         return success(lqjcxxRespVO);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/lqjcxx/vo/LqjcxxSaveReqVO.java

@@ -2,6 +2,7 @@ package com.unis.module.coding.controller.admin.lqjcxx.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
@@ -43,6 +44,6 @@ public class LqjcxxSaveReqVO {
     private BigDecimal lspjw;
 
     @Schema(description = "附件多个逗号隔开'',''(INFRA_FILE.URL)")
-    private String fileIds;
+    private List fileIds;
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/zjxx/vo/ZjxxSaveReqVO.java

@@ -6,7 +6,9 @@ import lombok.*;
 import java.time.LocalDate;
 import java.util.*;
 import javax.validation.constraints.*;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 质检信息新增/修改 Request VO")
@@ -43,7 +45,7 @@ public class ZjxxSaveReqVO {
     private Integer sfhg;
 
     @Schema(description = "附件多个逗号隔开'',''(INFRA_FILE.ID)")
-    private String fileIds;
+    private List fileIds;
 
     @Schema(description = "创建者")
     private String creator;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/crkxx/CrkxxDO.java

@@ -1,18 +1,14 @@
 package com.unis.module.coding.dal.dataobject.crkxx;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
 import com.unis.framework.mybatis.core.dataobject.BaseDO;
-import com.unis.framework.mybatis.core.type.StringListTypeHandler;
 import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
 
 /**
  * 出入库信息 DO

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/crkxx/CrkxxServiceImpl.java

@@ -47,7 +47,6 @@ public class CrkxxServiceImpl implements CrkxxService {
     public Long createCrkxx(CrkxxSaveReqVO createReqVO) {
         CrkxxDO crkxx = BeanUtils.toBean(createReqVO, CrkxxDO.class);
         //列表转成字符串用逗号隔开
-        String setString = createReqVO.getFileIds().toString();
         //插入和更新
         if (ObjectUtil.isEmpty(createReqVO.getId())) {
             // 插入前查询一下是否有hwkId

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/cwxx/CwxxServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.List;
 
 import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -120,8 +121,12 @@ public class CwxxServiceImpl implements CwxxService {
         if (CollectionUtils.isEmpty(cwxxDOS)) {
             throw exception(ERROR, "当前库区编码下无信息");
         }
+//        int currentYear = Year.now().getValue();
+//        int startYear = currentYear - 2; // 近三年的起始年份
+//        int endYear = currentYear;
         //查询财务年的信息
-        List<CwxxYearDO> cwxx_id = cwxxYearMapper.selectList(new QueryWrapper<CwxxYearDO>().eq("CWXX_ID", cwxxDOS.get(0).getId()));
+        List<CwxxYearDO> cwxx_id = cwxxYearMapper.selectList(
+                new QueryWrapper<CwxxYearDO>().eq("CWXX_ID", cwxxDOS.get(0).getId()));
         //财务信息和财务年信息的DO转成vo
         CwxxRespVO cwxxRespVO = BeanUtils.toBean(cwxxDOS.get(0), CwxxRespVO.class);
         List<CwxxYearSaveReqVO> cwxxYearSaveReqVOS = BeanUtils.toBean(cwxx_id, CwxxYearSaveReqVO.class);

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/delivery/DeliveryServiceImpl.java

@@ -112,6 +112,7 @@ public class DeliveryServiceImpl implements DeliveryService {
             if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO())) {
                 // set 单位id
                 createReqVO.getKqxxReqVO().setDwid(dwxx);
+                createReqVO.getKqxxReqVO().setShxydm(createReqVO.getDwxxReqVO().getTyxydm());
                 /*
                  * 生成库区代码--该单位下有几个库区
                  */
@@ -138,6 +139,8 @@ public class DeliveryServiceImpl implements DeliveryService {
                 log.info("获取库区编码({})", kqbm);
 
                 createReqVO.getKqxxReqVO().setKqbm(kqbm);
+                //所属法人企业(单位名称)
+                createReqVO.getKqxxReqVO().setSsfrqy(createReqVO.getDwxxReqVO().getDwmc());
                 //省市县编码获取
                 if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO().getSheng())) {
                     AreaLevelDO sheng = areaLevelMapper.selectListByAreaCode(createReqVO.getKqxxReqVO().getSheng());

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/lqjcxx/LqjcxxServiceImpl.java

@@ -96,7 +96,7 @@ public class LqjcxxServiceImpl implements LqjcxxService {
     @Override
     public LqjcxxDO getLqjcxxByCfId(Long cfId) {
         List<LqjcxxDO> cf_id = lqjcxxMapper.selectList(new QueryWrapper<LqjcxxDO>().eq("CF_ID", cfId));
-        LqjcxxDO lqjcxxDO = new LqjcxxDO();
+        LqjcxxDO lqjcxxDO = null;
         if (!CollectionUtils.isEmpty(cf_id)) {
             lqjcxxDO = cf_id.get(0);
         }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/syxx/SyxxServiceImpl.java

@@ -100,7 +100,7 @@ public class SyxxServiceImpl implements SyxxService {
     @Override
     public SyxxDO getSyxxByCfId(Long cfId) {
         List<SyxxDO> syxxDOS = syxxMapper.selectList(new QueryWrapper<SyxxDO>().eq("CF_ID", cfId));
-        SyxxDO syxxDO = new SyxxDO();
+        SyxxDO syxxDO = null;
         if (!CollectionUtil.isEmpty(syxxDOS)) {
             syxxDO = syxxDOS.get(0);
         }