填报

huimv-farm/src/main/java/vip/xiaonuo/money/entity/MoneyWriteOverdue.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -59,12 +60,14 @@ public class MoneyWriteOverdue implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", position = 5)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 到期日
      */
     @ApiModelProperty(value = "到期日", position = 6)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     /**

huimv-farm/src/main/java/vip/xiaonuo/money/param/MoneyWriteOverdueAddParam.java

@@ -3,6 +3,7 @@ package vip.xiaonuo.money.param;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -50,12 +51,14 @@ public class MoneyWriteOverdueAddParam  {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", position = 5)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 到期日
      */
     @ApiModelProperty(value = "到期日", position = 6)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     /**

huimv-farm/src/main/java/vip/xiaonuo/money/service/impl/MoneyOverdueServiceImpl.java

@@ -146,10 +146,11 @@ public class MoneyOverdueServiceImpl extends ServiceImpl<MoneyOverdueMapper, Mon
         queryWrapper.eq(StringUtils.isNotBlank(userName), "user_name", userName);
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.DAY_OF_MONTH, 15);
-        if (0 == type) {
+        if (null == type) {
+        } else if (0 == type) {
             queryWrapper.ge("end_time", calendar.getTime());
         } else if (1 == type) {
-            queryWrapper.le("end_time",DateUtil.beginOfDay(new Date()));
+            queryWrapper.le("end_time", DateUtil.beginOfDay(new Date()));
         } else if (2 == type) {
             queryWrapper.between("end_time", DateUtil.beginOfDay(new Date()), calendar.getTime());
         }

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionTargetServiceImpl.java

@@ -65,7 +65,7 @@ public class ProductionTargetServiceImpl extends ServiceImpl<ProductionTargetMap
         ProductionWritePlan writePlan = writePlanMapper.selectOne(queryWrapper1);//计划生产量
 
         ProductionTarget productionTarget = new ProductionTarget();
-        if (ObjectUtil.isEmpty(writePlan) || "0".equals(writePlan.getProductionPlan())) {
+         if (ObjectUtil.isEmpty(writePlan) || "0.00".equals(writePlan.getProductionPlan())) {
             productionTarget.setPlanProduction("0");
             productionTarget.setPlanCompleteRate("0");
         } else {

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionYieldServiceImpl.java

@@ -63,8 +63,8 @@ public class ProductionYieldServiceImpl extends ServiceImpl<ProductionYieldMappe
         BigDecimal math = new BigDecimal("10000");
 
         for (ProductionYield productionYield : productionYields) {
-            BigDecimal bg = new BigDecimal(productionYield.getActualProduction());
-            productionYield.setActualProduction(bg.divide(math, 2, RoundingMode.HALF_UP).toString());
+//            BigDecimal bg = new BigDecimal(productionYield.getActualProduction());
+//            productionYield.setActualProduction(bg.divide(math, 2, RoundingMode.HALF_UP).toString());
 
             QueryWrapper<ProductionWritePlan> queryWrapper1 = new QueryWrapper<>();
             if (0 == timeType) {

huimv-farm/src/main/java/vip/xiaonuo/write/controller/WriteCheckController.java

@@ -52,8 +52,8 @@ public class WriteCheckController {
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation("检验记录发放收回台账分页")
-    @PostMapping("/write-check/page")
+    @ApiOperation("检验记录发放收回台账列表")
+    @PostMapping("/write-check/list")
     public CommonResult page(@RequestBody WriteUnqualifiedPageParam pageParam) {
         return checkService.page(pageParam);
     }

huimv-farm/src/main/java/vip/xiaonuo/write/controller/WriteListController.java

@@ -38,7 +38,6 @@ public class WriteListController {
     @ApiOperation("检验记录列表分页")
     @PostMapping("/write-list/page")
     public CommonResult page(@RequestBody WriteListPageParam listPageParam) {
-        listService.page(listPageParam);
-        return CommonResult.ok();
+        return listService.page(listPageParam);
     }
 }

huimv-farm/src/main/java/vip/xiaonuo/write/controller/WriteUnqualifiedController.java

@@ -48,14 +48,14 @@ public class WriteUnqualifiedController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("不合格品台账修改")
     @PostMapping("/write-unqualified/update")
-    public CommonResult update(@RequestBody WriteUnqualifiedEditParam editParam) {
+    public CommonResult update(@RequestBody WriteUnqualifiedParam editParam) {
         unqualifiedService.update(editParam);
         return CommonResult.ok();
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation("不合格品台账分页")
-    @PostMapping("/write-unqualified/page")
+    @ApiOperation("不合格品台账列表")
+    @PostMapping("/write-unqualified/list")
     public CommonResult page(@RequestBody WriteUnqualifiedPageParam pageParam) {
         return unqualifiedService.page(pageParam);
     }

huimv-farm/src/main/java/vip/xiaonuo/write/entity/WriteCheck.java

@@ -94,19 +94,19 @@ public class WriteCheck implements Serializable {
      * 存档数量
      */
     @ApiModelProperty(value = "存档数量",position = 10)
-    private Date fileNum;
+    private String fileNum;
 
     /**
      * 销毁数量
      */
     @ApiModelProperty(value = "销毁数量",position = 11)
-    private Date destroyNum;
+    private String destroyNum;
 
     /**
      * QA数量
      */
     @ApiModelProperty(value = "QA数量",position = 12)
-    private Date QANum;
+    private String qaNum;
 
     /**
      * 收回人日期
@@ -134,4 +134,12 @@ public class WriteCheck implements Serializable {
     private Integer listId;
 
 
+    @ApiModelProperty(value = "发放人",position = 17)
+    private String sendName;
+
+    @ApiModelProperty(value = "接收人",position = 18)
+    private String receiveName;
+
+    @ApiModelProperty(value = "收回人",position = 19)
+    private String withdrawName;
 }

huimv-farm/src/main/java/vip/xiaonuo/write/entity/WriteList.java

@@ -58,4 +58,15 @@ public class WriteList implements Serializable {
     private String orgId;
 
 
+    @ApiModelProperty(value = "编制日期",position = 5)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date editTime;
+
+    @ApiModelProperty(value = "审核日期",position = 6)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date examineTime;
+
+    @ApiModelProperty(value = "年",position = 7)
+    private String year;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/write/entity/WriteUnqualified.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -86,4 +88,14 @@ public class WriteUnqualified implements Serializable {
     @ApiModelProperty(value = "上级记录id",position = 11)
     private Integer listId;
 
+    @ApiModelProperty(value = "编制日期", position = 12)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date editTime;
+
+
+
+    @ApiModelProperty(value = "审核日期",position = 13)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date examineTime;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/write/entity/vo/WriteCheckVo.java

@@ -0,0 +1,30 @@
+package vip.xiaonuo.write.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import vip.xiaonuo.write.entity.WriteCheck;
+import vip.xiaonuo.write.entity.WriteUnqualified;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 不合格品台账
+ * </p>
+ *
+ * @author author
+ * @since 2025-01-02
+ */
+@Data
+public class WriteCheckVo {
+
+    private List<WriteCheck> writeChecks;
+
+    @ApiModelProperty(value = "组织id",position = 10)
+    private String orgId;
+
+    @ApiModelProperty(value = "listId",position = 10)
+    private Integer listId;
+}

huimv-farm/src/main/java/vip/xiaonuo/write/entity/vo/WriteUnqualifiedVo.java

@@ -0,0 +1,46 @@
+package vip.xiaonuo.write.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import vip.xiaonuo.write.entity.WriteUnqualified;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 不合格品台账
+ * </p>
+ *
+ * @author author
+ * @since 2025-01-02
+ */
+@Data
+public class WriteUnqualifiedVo  {
+
+    private List<WriteUnqualified> writeUnqualifieds;
+
+    @ApiModelProperty(value = "年",position = 9)
+    private String year;
+
+    @ApiModelProperty(value = "组织id",position = 10)
+    private String orgId;
+
+    @ApiModelProperty(value = "编制日期", position = 12)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date editTime;
+
+    @ApiModelProperty(value = "审核日期",position = 13)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date examineTime;
+
+    @ApiModelProperty(value = "listId",position = 10)
+    private Integer listId;
+}

huimv-farm/src/main/java/vip/xiaonuo/write/param/WriteCheckAddParam.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.write.param;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import vip.xiaonuo.write.entity.WriteCheck;
 
@@ -9,4 +10,9 @@ import java.util.List;
 public class WriteCheckAddParam {
 
     private List<WriteCheck> writeChecks;
+
+
+    @ApiModelProperty(value = "orgId",position = 4)
+    private String orgId;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/write/param/WriteCheckEditParam.java

@@ -4,8 +4,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sun.istack.NotNull;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import vip.xiaonuo.write.entity.WriteCheck;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -18,105 +20,12 @@ import java.util.Date;
 @Data
 public class WriteCheckEditParam {
 
-    @ApiModelProperty(value = "id",required = true,position =1)
-    @NotNull
-    private Integer id;
+    private List<WriteCheck> writeChecks;
 
-    /**
-     * 检验原始记录 0为原始记录 1为其他
-     */
-    @ApiModelProperty(value = "检验原始记录 0为原始记录 1为其他",position = 1)
-    private Integer originalRecord;
-
-    /**
-     * 其他内容
-     */
-    @ApiModelProperty(value = "其他内容",position = 2)
-    private String other;
-
-    /**
-     * 记录名称
-     */
-    @ApiModelProperty(value = "记录名称",position = 3)
-    private String recordName;
-
-    /**
-     * 记录编号
-     */
-    @ApiModelProperty(value = "记录编号",position = 4)
-    private String recordCode;
-
-    /**
-     * 样品代码/批号
-     */
-    @ApiModelProperty(value = "样品代码/批号",position = 5)
-    private String batchNum;
-
-    /**
-     * 检验号
-     */
-    @ApiModelProperty(value = "检验号",position = 6)
-    private String inspectionNum;
-
-    /**
-     * 发放人日期
-     */
-    @ApiModelProperty(value = "发放人日期", position = 7)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date sendDate;
-
-    /**
-     * 接收人日期
-     */
-    @ApiModelProperty(value = "接收人日期",position = 8)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date receiveDate;
-
-
-    /**
-     * 收回后去向 0存档 1销毁 2QA 3收发平横
-     */
-    @ApiModelProperty(value = "收发平横 0为未勾选 1为勾选",position = 9)
-    private Integer withdrawType;
-
-    /**
-     * 存档数量
-     */
-    @ApiModelProperty(value = "存档数量",position = 10)
-    private Date fileNum;
-
-    /**
-     * 销毁数量
-     */
-    @ApiModelProperty(value = "销毁数量",position = 11)
-    private Date destroyNum;
-
-    /**
-     * QA数量
-     */
-    @ApiModelProperty(value = "QA数量",position = 12)
-    private Date QANum;
-
-    /**
-     * 收回人日期
-     */
-    @ApiModelProperty(value = "收回人日期",position = 13)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date withdrawDate;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注",position = 14)
-    private String remark;
-
-    /**
-     * 组织id
-     */
-    @ApiModelProperty(value = "组织id",position = 15)
+    @ApiModelProperty(value = "orgId",position = 4)
     private String orgId;
 
-
-
+    @ApiModelProperty(value = "listId",position = 5)
+    private Integer listId;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/write/param/WriteUnqualifiedPageParam.java

@@ -12,10 +12,5 @@ public class WriteUnqualifiedPageParam {
     @ApiModelProperty(value = "列表id",position = 2)
     private Integer listId;
 
-    @ApiModelProperty(value = "当前页码",position = 3)
-    private Integer pageNum;
-
-    @ApiModelProperty(value = "页码大小",position = 4)
-    private Integer pageSize;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/write/param/WriteUnqualifiedParam.java

@@ -1,14 +1,34 @@
 package vip.xiaonuo.write.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import vip.xiaonuo.write.entity.WriteTravelLog;
 import vip.xiaonuo.write.entity.WriteTravelRoute;
 import vip.xiaonuo.write.entity.WriteUnqualified;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
 public class WriteUnqualifiedParam {
 
     private List<WriteUnqualified> writeUnqualifieds;
+
+    @ApiModelProperty(value = "年",position = 1)
+    private String year;
+
+    @ApiModelProperty(value = "编制日期",position = 2)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date editTime;
+
+    @ApiModelProperty(value = "审核日期",position = 3)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date examineTime;
+
+    @ApiModelProperty(value = "orgId",position = 4)
+    private String orgId;
+
+    @ApiModelProperty(value = "listId",position = 4)
+    private Integer listId;
 }

huimv-farm/src/main/java/vip/xiaonuo/write/service/IWriteUnqualifiedService.java

@@ -22,7 +22,7 @@ public interface IWriteUnqualifiedService extends IService<WriteUnqualified> {
 
     void add(WriteUnqualifiedParam param);
 
-    void update(WriteUnqualifiedEditParam editParam);
+    void update(WriteUnqualifiedParam editParam);
 
     CommonResult page(WriteUnqualifiedPageParam pageParam);
 

huimv-farm/src/main/java/vip/xiaonuo/write/service/impl/WriteCheckServiceImpl.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.write.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.write.entity.WriteCheck;
 import vip.xiaonuo.write.entity.WriteList;
 import vip.xiaonuo.write.entity.WriteUnqualified;
+import vip.xiaonuo.write.entity.vo.WriteCheckVo;
+import vip.xiaonuo.write.entity.vo.WriteUnqualifiedVo;
 import vip.xiaonuo.write.mapper.WriteCheckMapper;
 import vip.xiaonuo.write.mapper.WriteListMapper;
 import vip.xiaonuo.write.param.WriteCheckAddParam;
@@ -42,12 +45,12 @@ public class WriteCheckServiceImpl extends ServiceImpl<WriteCheckMapper, WriteCh
     @Override
     @Transactional
     public void add(WriteCheckAddParam addParam) {
-
+        String orgId = addParam.getOrgId();
         List<WriteCheck> writeChecks = addParam.getWriteChecks();
         WriteList writeList = new WriteList();
         writeList.setDate(new Date());
         writeList.setType(1);
-        writeList.setOrgId(writeChecks.get(0).getOrgId());
+        writeList.setOrgId(orgId);
         writeList.setDate(new Date());
         String name = "";
         for (int i = 0; i < writeChecks.size(); i++) {
@@ -63,6 +66,7 @@ public class WriteCheckServiceImpl extends ServiceImpl<WriteCheckMapper, WriteCh
         WriteList writeList1 = listMapper.selectOne(new QueryWrapper<WriteList>().orderByDesc("id").last(" limit 1"));
         for (WriteCheck writeCheck : writeChecks) {
             writeCheck.setListId(writeList1.getId());
+            writeCheck.setOrgId(orgId);
             checkMapper.insert(writeCheck);
         }
     }
@@ -70,23 +74,59 @@ public class WriteCheckServiceImpl extends ServiceImpl<WriteCheckMapper, WriteCh
     @Override
     @Transactional
     public void update(WriteCheckEditParam editParam) {
-        WriteCheck writeCheck = checkMapper.selectById(editParam.getId());
-        BeanUtil.copyProperties(editParam, writeCheck);
-        checkMapper.updateById(writeCheck);
+        String orgId = editParam.getOrgId();
+        Integer listId = editParam.getListId();
+        List<WriteCheck> writeChecks = editParam.getWriteChecks();
+        for (WriteCheck writeCheck : writeChecks) {
+            WriteCheck check = checkMapper.selectById(writeCheck.getId());
+            if (ObjectUtil.isEmpty(check)) {
+                writeCheck.setOrgId(orgId);
+                writeCheck.setListId(listId);
+                checkMapper.insert(writeCheck);
+            } else {
+                checkMapper.updateById(check);
+            }
+        }
+        WriteList writeList = listMapper.selectById(listId);
+        String name = "";
+        for (int i = 0; i < writeChecks.size(); i++) {
+            if (i < writeChecks.size() - 1) {
+                name = writeChecks.get(i).getRecordName() + "," + name;
+            } else {
+                name = name + writeChecks.get(i).getRecordName();
+            }
+        }
+        writeList.setName(name);
+        listMapper.updateById(writeList);
     }
 
     @Override
     public CommonResult page(WriteUnqualifiedPageParam pageParam) {
         Integer listId = pageParam.getListId();
-        Page<WriteCheck> page = new Page(pageParam.getPageNum(), pageParam.getPageSize());
         QueryWrapper<WriteCheck> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("list_id", listId);
-        return CommonResult.data(checkMapper.selectPage(page, queryWrapper));
+        List<WriteCheck> writeChecks = checkMapper.selectList(queryWrapper);
+        QueryWrapper<WriteList> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("id", listId);
+        WriteList writeList = listMapper.selectOne(queryWrapper1);
+        WriteCheckVo vo = new WriteCheckVo();
+        if (ObjectUtil.isNotEmpty(writeList)) {
+            vo.setWriteChecks(writeChecks);
+            vo.setOrgId(writeList.getOrgId());
+            vo.setListId(writeList.getId());
+        }
+        return CommonResult.data(vo);
     }
 
     @Override
     public void delete(Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
-        checkMapper.deleteById(id);
+        WriteList writeList = listMapper.selectById(id);
+        List<WriteCheck> writeChecks = checkMapper.selectList(new QueryWrapper<WriteCheck>().eq("list_id", id));
+        for (WriteCheck writeCheck : writeChecks) {
+            checkMapper.deleteById(writeCheck);
+        }
+        listMapper.deleteById(writeList);
+
     }
 }

huimv-farm/src/main/java/vip/xiaonuo/write/service/impl/WriteListServiceImpl.java

@@ -31,8 +31,7 @@ public class WriteListServiceImpl extends ServiceImpl<WriteListMapper, WriteList
         Integer type = listPageParam.getType();
         Page<WriteList> page = new Page<>(listPageParam.getPageNum(), listPageParam.getPageSize());
         QueryWrapper<WriteList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(listPageParam.getOrgId()), "org_id", listPageParam.getOrgId())
-                .eq(StringUtils.isNotBlank(String.valueOf(type)), "type", type);
+        queryWrapper.eq(StringUtils.isNotBlank(listPageParam.getOrgId()), "org_id", listPageParam.getOrgId());
         if (null != type) {
             queryWrapper.eq("type", type);
         }

huimv-farm/src/main/java/vip/xiaonuo/write/service/impl/WriteUnqualifiedServiceImpl.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.write.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.hr.modular.baseemployeeinfo.entity.HrBaseEmployeeInfo;
+import vip.xiaonuo.write.entity.WriteCheck;
 import vip.xiaonuo.write.entity.WriteList;
 import vip.xiaonuo.write.entity.WriteUnqualified;
+import vip.xiaonuo.write.entity.vo.WriteUnqualifiedVo;
 import vip.xiaonuo.write.mapper.WriteListMapper;
 import vip.xiaonuo.write.mapper.WriteUnqualifiedMapper;
 import vip.xiaonuo.write.param.WriteUnqualifiedEditParam;
@@ -44,9 +47,16 @@ public class WriteUnqualifiedServiceImpl extends ServiceImpl<WriteUnqualifiedMap
     @Transactional
     public void add(WriteUnqualifiedParam param) {
         List<WriteUnqualified> unqualifieds = param.getWriteUnqualifieds();
+        String year = param.getYear();
+        Date editTime = param.getEditTime();
+        Date examineTime = param.getExamineTime();
+        String orgId = param.getOrgId();
         WriteList writeList = new WriteList();
         writeList.setType(0);
-        writeList.setOrgId(param.getWriteUnqualifieds().get(0).getOrgId());
+        writeList.setEditTime(editTime);
+        writeList.setExamineTime(examineTime);
+        writeList.setYear(year);
+        writeList.setOrgId(orgId);
         writeList.setDate(new Date());
         String name = "";
         for (int i = 0; i < unqualifieds.size(); i++) {
@@ -61,31 +71,78 @@ public class WriteUnqualifiedServiceImpl extends ServiceImpl<WriteUnqualifiedMap
         WriteList writeList1 = listMapper.selectOne(new QueryWrapper<WriteList>().orderByDesc("id").last(" limit 1"));
         for (WriteUnqualified unqualified : unqualifieds) {
             unqualified.setListId(writeList1.getId());
+            unqualified.setYear(year);
+            unqualified.setEditTime(editTime);
+            unqualified.setExamineTime(examineTime);
+            unqualified.setOrgId(orgId);
             unqualifiedMapper.insert(unqualified);
         }
     }
 
     @Override
     @Transactional
-    public void update(WriteUnqualifiedEditParam editParam) {
-        WriteUnqualified unqualified = unqualifiedMapper.selectById(editParam.getId());
-        BeanUtil.copyProperties(editParam, unqualified);
-        unqualifiedMapper.updateById(unqualified);
+    public void update(WriteUnqualifiedParam editParam) {
+        String year = editParam.getYear();
+        Date editTime = editParam.getEditTime();
+        Date examineTime = editParam.getExamineTime();
+        String orgId = editParam.getOrgId();
+        Integer listId = editParam.getListId();
+        List<WriteUnqualified> unqualifieds = editParam.getWriteUnqualifieds();
+        for (WriteUnqualified unqualified : unqualifieds) {
+            WriteUnqualified writeUnqualified = unqualifiedMapper.selectById(unqualified.getId());
+            if (ObjectUtil.isEmpty(writeUnqualified)) {
+                unqualified.setYear(year);
+                unqualified.setEditTime(editTime);
+                unqualified.setExamineTime(examineTime);
+                unqualified.setOrgId(orgId);
+                unqualified.setListId(listId);
+                unqualifiedMapper.insert(unqualified);
+            } else {
+                unqualifiedMapper.updateById(unqualified);
+            }
+        }
+        WriteList writeList = listMapper.selectById(listId);
+        String name = "";
+        for (int i = 0; i < unqualifieds.size(); i++) {
+            if (i < unqualifieds.size() - 1) {
+                name = unqualifieds.get(i).getProduceName() + "," + name;
+            } else {
+                name = name + unqualifieds.get(i).getProduceName();
+            }
+        }
+        writeList.setName(name);
+        listMapper.updateById(writeList);
     }
 
     @Override
     public CommonResult page(WriteUnqualifiedPageParam pageParam) {
         Integer listId = pageParam.getListId();
-        Page<WriteUnqualified> page = new Page<>(pageParam.getPageNum(), pageParam.getPageSize());
         QueryWrapper<WriteUnqualified> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("list_id", listId);
-        return CommonResult.data(unqualifiedMapper.selectPage(page, queryWrapper));
+        List<WriteUnqualified> unqualifieds = unqualifiedMapper.selectList(queryWrapper);
+        QueryWrapper<WriteList> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("id", listId);
+        WriteList writeList = listMapper.selectOne(queryWrapper1);
+        WriteUnqualifiedVo vo = new WriteUnqualifiedVo();
+        if (ObjectUtil.isNotEmpty(writeList)) {
+            vo.setWriteUnqualifieds(unqualifieds);
+            vo.setEditTime(writeList.getEditTime());
+            vo.setExamineTime(writeList.getExamineTime());
+            vo.setOrgId(writeList.getOrgId());
+            vo.setYear(writeList.getYear());
+            vo.setListId(writeList.getId());
+        }
+        return CommonResult.data(vo);
     }
 
     @Override
     public void delete(Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
-        unqualifiedMapper.deleteById(id);
-
+        WriteList writeList = listMapper.selectById(id);
+        List<WriteUnqualified> writeChecks = unqualifiedMapper.selectList(new QueryWrapper<WriteUnqualified>().eq("list_id", id));
+        for (WriteUnqualified writeCheck : writeChecks) {
+            unqualifiedMapper.deleteById(writeCheck);
+        }
+        listMapper.deleteById(writeList);
     }
 }

huimv-farm/src/main/resources/mapper/MoneyOverdueMapper.xml

@@ -14,10 +14,10 @@ LEFT JOIN
     money_write_overdue AS o
 ON
     w.user_name = o.user_name
-    WHERE date_time between #{startTime} and #{endTime}
+   <!-- WHERE date_time between #{startTime} and #{endTime}
         <if test="orgId!=null and orgId!=''">
             and  w.org_id = #{orgId}
-        </if>
+        </if>-->
 	GROUP BY  w.user_name
 	ORDER BY w.collect_price DESC
     </select>