对接修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialscheckplan/MaterialsCheckPlanController.java

@@ -4,12 +4,10 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanPageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanSaveReqVO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.materialscheckplan.MaterialsCheckPlanDO;
 import cn.iocoder.yudao.module.iscs.service.materialscheckplan.MaterialsCheckPlanService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -65,8 +63,8 @@ public class MaterialsCheckPlanController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:query')")
     public CommonResult<MaterialsCheckPlanRespVO> selectMaterialsCheckPlanById(@RequestParam("id") Long id) {
-        MaterialsCheckPlanDO materialsCheckPlan = materialsCheckPlanService.getMaterialsCheckPlan(id);
-        return success(BeanUtils.toBean(materialsCheckPlan, MaterialsCheckPlanRespVO.class));
+        MaterialsCheckPlanRespVO materialsCheckPlan = materialsCheckPlanService.getMaterialsCheckPlan(id);
+        return success(materialsCheckPlan);
     }
 
     @GetMapping("/getMaterialsCheckPlanPage")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialsloan/vo/MaterialsLoanPageReqVO.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.util.Date;
 
 @Schema(description = "管理后台 - 物资借出分页 Request VO")
 @Data
@@ -23,12 +21,12 @@ public class MaterialsLoanPageReqVO extends PageParam {
     private Long loanFromId;
 
     @Schema(description = "领取时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] loanTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loanTime;
 
     @Schema(description = "提醒时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] reminderTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reminderTime;
 
     @Schema(description = "归还人ID", example = "28697")
     private Long restitutionUserId;
@@ -37,15 +35,15 @@ public class MaterialsLoanPageReqVO extends PageParam {
     private Long restitutionToId;
 
     @Schema(description = "理应归还时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] restitutionTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date restitutionTime;
 
     @Schema(description = "实际归还时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] actualRestitutionTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actualRestitutionTime;
 
     @Schema(description = "超时报警")
-    private LocalDateTime timeoutAlarm;
+    private Date timeoutAlarm;
 
     @Schema(description = "是否需要归还")
     private Integer restitutionRequired;
@@ -57,8 +55,8 @@ public class MaterialsLoanPageReqVO extends PageParam {
     private String status;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @Schema(description = "物资名称")
     private String materialsName;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialsloan/vo/MaterialsLoanRespVO.java

@@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Schema(description = "管理后台 - 物资借出 Response VO")
 @Data
@@ -30,11 +32,13 @@ public class MaterialsLoanRespVO {
 
     @Schema(description = "领取时间")
     @ExcelProperty("领取时间")
-    private LocalDateTime loanTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loanTime;
 
     @Schema(description = "提醒时间")
     @ExcelProperty("提醒时间")
-    private LocalDateTime reminderTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reminderTime;
 
     @Schema(description = "归还人ID", example = "28697")
     @ExcelProperty("归还人ID")
@@ -50,11 +54,13 @@ public class MaterialsLoanRespVO {
 
     @Schema(description = "实际归还时间")
     @ExcelProperty("实际归还时间")
-    private LocalDateTime actualRestitutionTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actualRestitutionTime;
 
     @Schema(description = "超时报警")
     @ExcelProperty("超时报警")
-    private LocalDateTime timeoutAlarm;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date timeoutAlarm;
 
     @Schema(description = "是否需要归还", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否需要归还")
@@ -70,7 +76,8 @@ public class MaterialsLoanRespVO {
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @Schema(description = "领取柜Name")
     private String loanFromName;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/blacklist/BlacklistMapper.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.iscs.controller.admin.blacklist.vo.BlacklistRespV
 import cn.iocoder.yudao.module.iscs.controller.admin.blacklist.vo.WhiteUserVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.blacklist.BlacklistDO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,6 +36,15 @@ public interface BlacklistMapper extends BaseMapperX<BlacklistDO> {
 
     Page<WhiteUserVO> getWhiteUserPage(Page<BlacklistDO> page, @Param(value = "vo") BlacklistPageReqVO vo);
 
+    @Delete({
+            "<script>",
+            "DELETE FROM sys_blacklist",
+            "WHERE id IN",
+            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
     Boolean physicalDeleteById(@Param(value = "ids") List<Long> ids);
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/materialsloan/MaterialsLoanMapper.java

@@ -23,17 +23,16 @@ public interface MaterialsLoanMapper extends BaseMapperX<MaterialsLoanDO> {
                 .eqIfPresent(MaterialsLoanDO::getMaterialsId, reqVO.getMaterialsId())
                 .eqIfPresent(MaterialsLoanDO::getLoanUserId, reqVO.getLoanUserId())
                 .eqIfPresent(MaterialsLoanDO::getLoanFromId, reqVO.getLoanFromId())
-                .betweenIfPresent(MaterialsLoanDO::getLoanTime, reqVO.getLoanTime())
-                .betweenIfPresent(MaterialsLoanDO::getReminderTime, reqVO.getReminderTime())
+                // .betweenIfPresent(MaterialsLoanDO::getReminderTime, reqVO.getReminderTime())
                 .eqIfPresent(MaterialsLoanDO::getRestitutionUserId, reqVO.getRestitutionUserId())
                 .eqIfPresent(MaterialsLoanDO::getRestitutionToId, reqVO.getRestitutionToId())
-                .betweenIfPresent(MaterialsLoanDO::getRestitutionTime, reqVO.getRestitutionTime())
-                .betweenIfPresent(MaterialsLoanDO::getActualRestitutionTime, reqVO.getActualRestitutionTime())
+                // .betweenIfPresent(MaterialsLoanDO::getRestitutionTime, reqVO.getRestitutionTime())
+                // .betweenIfPresent(MaterialsLoanDO::getActualRestitutionTime, reqVO.getActualRestitutionTime())
                 .eqIfPresent(MaterialsLoanDO::getTimeoutAlarm, reqVO.getTimeoutAlarm())
                 .eqIfPresent(MaterialsLoanDO::getRestitutionRequired, reqVO.getRestitutionRequired())
                 .eqIfPresent(MaterialsLoanDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(MaterialsLoanDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(MaterialsLoanDO::getCreateTime, reqVO.getCreateTime())
+                // .betweenIfPresent(MaterialsLoanDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(MaterialsLoanDO::getId));
     }
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/blacklist/BlacklistServiceImpl.java

@@ -69,13 +69,13 @@ public class BlacklistServiceImpl extends ServiceImpl<BlacklistMapper, Blacklist
     }
 
     @Override
-        public void deleteBlacklistListByIds(List<Long> ids) {
+    public void deleteBlacklistListByIds(List<Long> ids) {
         // 校验存在
         validateBlacklistExists(ids);
         // 删除
         blacklistMapper.physicalDeleteById(ids);
 
-        }
+    }
 
     private void validateBlacklistExists(List<Long> ids) {
         List<BlacklistDO> list = blacklistMapper.selectByIds(ids);

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/materialscheckplan/MaterialsCheckPlanService.java

@@ -52,7 +52,7 @@ public interface MaterialsCheckPlanService extends IService<MaterialsCheckPlanDO
      * @param id 编号
      * @return 物资检查计划
      */
-    MaterialsCheckPlanDO getMaterialsCheckPlan(Long id);
+    MaterialsCheckPlanRespVO getMaterialsCheckPlan(Long id);
 
     /**
      * 获得物资检查计划分页

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/materialscheckplan/MaterialsCheckPlanServiceImpl.java

@@ -229,8 +229,15 @@ public class MaterialsCheckPlanServiceImpl extends ServiceImpl<MaterialsCheckPla
     }
 
     @Override
-    public MaterialsCheckPlanDO getMaterialsCheckPlan(Long id) {
-        return materialsCheckPlanMapper.selectById(id);
+    public MaterialsCheckPlanRespVO getMaterialsCheckPlan(Long id) {
+        MaterialsCheckPlanDO materialsCheckPlanDO = materialsCheckPlanMapper.selectById(id);
+        MaterialsCheckPlanRespVO bean = BeanUtils.toBean(materialsCheckPlanDO, MaterialsCheckPlanRespVO.class);
+        if (materialsCheckPlanDO != null) {
+            List<MaterialsPlanCabinetDO> list = materialsPlanCabinetService.list(Wrappers.<MaterialsPlanCabinetDO>lambdaQuery()
+                    .eq(MaterialsPlanCabinetDO::getPlanId, id));
+            bean.setCabinetIds(list.stream().map(MaterialsPlanCabinetDO::getCabinetId).collect(Collectors.toList()));
+        }
+        return bean;
     }
 
     @Override
@@ -252,7 +259,7 @@ public class MaterialsCheckPlanServiceImpl extends ServiceImpl<MaterialsCheckPla
             List<MaterialsCabinetDO> cabinets = materialsCabinetService.list(Wrappers.<MaterialsCabinetDO>lambdaQuery()
                     .in(MaterialsCabinetDO::getId, cabinetIds));
             for (MaterialsCheckPlanRespVO record : respVOPageResult.getList()) {
-                List<Long> cabinetId = planCabinets.stream().filter(o -> o.getPlanId().equals(record.getPlanId()))
+                List<Long> cabinetId = planCabinets.stream().filter(o -> o.getPlanId().equals(record.getId()))
                         .map(MaterialsPlanCabinetDO::getCabinetId).toList();
                 String cabinetName = cabinets.stream()
                         .filter(cabinet -> cabinetId.contains(cabinet.getId()))

yudao-module-iscs/src/main/resources/mapper/BlacklistMapper.xml

@@ -45,10 +45,4 @@
         order by u.id asc
     </select>
 
-    <delete id="physicalDeleteById">
-        DELETE FROM sys_blacklist WHERE id in
-        <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-    </delete>
 </mapper>