内外部损失

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsLossDetailDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QcsLossDetailDo;
+import com.rongwei.rwcommon.base.BaseDao;
+
+public interface QcsLossDetailDao extends BaseDao<QcsLossDetailDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/QcsLossDetailService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QcsLossDetailDo;
+
+public interface QcsLossDetailService extends IService<QcsLossDetailDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsLossDetailImpl.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QcsLossDetailDao;
+import com.rongwei.bscommon.sys.service.QcsLossDetailService;
+import com.rongwei.bsentity.domain.QcsLossDetailDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QcsLossDetailImpl extends ServiceImpl<QcsLossDetailDao, QcsLossDetailDo> implements QcsLossDetailService {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMainCostServiceImpl.java

@@ -3,12 +3,10 @@ package com.rongwei.bscommon.sys.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.QcsMainCostDao;
 import com.rongwei.bscommon.sys.service.QcsColumnConfigService;
+import com.rongwei.bscommon.sys.service.QcsLossDetailService;
 import com.rongwei.bscommon.sys.service.QcsMainCostService;
 import com.rongwei.bscommon.sys.service.QcsMainDetailService;
-import com.rongwei.bsentity.domain.QcsColumnConfigDo;
-import com.rongwei.bsentity.domain.QcsMainCostDo;
-import com.rongwei.bsentity.domain.QcsMainDetailDo;
-import com.rongwei.bsentity.domain.QcsSubjectConfigDo;
+import com.rongwei.bsentity.domain.*;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import org.slf4j.Logger;
@@ -35,6 +33,8 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
     @Autowired
     QcsColumnConfigService qcsColumnConfigService;
     @Autowired
+    QcsLossDetailService qcsLossDetailService;
+    @Autowired
     QcsMainCostDao qcsMainCostDao;
 
     @Override
@@ -48,6 +48,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
         List<QcsMainCostDo> qcsMainCostDoList = new ArrayList<>();
         List<QcsMainDetailDo> qcsMainDetailDoList = new ArrayList<>();
         List<QcsColumnConfigDo> qcsColumnConfigDoList = new ArrayList<>();
+        List<QcsLossDetailDo> qcsLossDetailDoList = new ArrayList<>();
 
         QcsMainCostDo qcsMainCostDo = qcsMainCostService.getById(costId);
         Map<String, Object> detailMap = qcsMainCostDao.getAmountSum(costId);
@@ -100,7 +101,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                 qualitycosttotal = qualitycosttotal.add(qcsMainCostDo2.getCosttotal());
             }
         } else {
-            //创建同一单位相同年月的预防成本数据
+            //创建同一单位相同年月的鉴定成本数据
             String mainId2 = SecurityUtil.getUUID();
             qcsMainCostDo2 = new QcsMainCostDo();
             qcsMainCostDo2.setId(mainId2);
@@ -129,14 +130,20 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                 qualitycosttotal = qualitycosttotal.add(qcsMainCostDo3.getCosttotal());
             }
         } else {
-            //创建同一单位相同年月的预防成本数据
-            String mainId1 = SecurityUtil.getUUID();
+            //创建同一单位相同年月的内部损失数据
+            String mainId3 = SecurityUtil.getUUID();
             qcsMainCostDo3 = new QcsMainCostDo();
-            qcsMainCostDo3.setId(mainId1);
+            qcsMainCostDo3.setId(mainId3);
             qcsMainCostDo3.setBaseid(qcsMainCostDo.getBaseid());
             qcsMainCostDo3.setBasename(qcsMainCostDo.getBasename());
             qcsMainCostDo3.setYearmonth(qcsMainCostDo.getYearmonth());
             qcsMainCostDo3.setCosttype("3");
+
+            //明细
+            QcsLossDetailDo qcsLossDetailDo3 = new QcsLossDetailDo();
+            qcsLossDetailDo3.setId(SecurityUtil.getUUID());
+            qcsLossDetailDo3.setMainid(mainId3);
+            qcsLossDetailDoList.add(qcsLossDetailDo3);
         }
 
         //外部损失4
@@ -146,14 +153,20 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                 qualitycosttotal = qualitycosttotal.add(qcsMainCostDo4.getCosttotal());
             }
         } else {
-            //创建同一单位相同年月的预防成本数据
-            String mainId1 = SecurityUtil.getUUID();
+            //创建同一单位相同年月的外部损失数据
+            String mainId4 = SecurityUtil.getUUID();
             qcsMainCostDo4 = new QcsMainCostDo();
-            qcsMainCostDo4.setId(mainId1);
+            qcsMainCostDo4.setId(mainId4);
             qcsMainCostDo4.setBaseid(qcsMainCostDo.getBaseid());
             qcsMainCostDo4.setBasename(qcsMainCostDo.getBasename());
             qcsMainCostDo4.setYearmonth(qcsMainCostDo.getYearmonth());
             qcsMainCostDo4.setCosttype("4");
+
+            //明细
+            QcsLossDetailDo qcsLossDetailDo4 = new QcsLossDetailDo();
+            qcsLossDetailDo4.setId(SecurityUtil.getUUID());
+            qcsLossDetailDo4.setMainid(mainId4);
+            qcsLossDetailDoList.add(qcsLossDetailDo4);
         }
 
         //内外部损失存字段初始化
@@ -193,13 +206,17 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
         boolean bool2 = qcsMainCostService.saveOrUpdateBatch(qcsMainCostDoList);
         boolean bool3 = true;
         boolean bool4 = true;
+        boolean bool5 = true;
         if (qcsMainDetailDoList.size() > 0) {
             bool3 = qcsMainDetailService.saveBatch(qcsMainDetailDoList);
         }
         if (qcsColumnConfigDoList.size() > 0) {
             bool4 = qcsColumnConfigService.saveBatch(qcsColumnConfigDoList);
         }
-        if (bool1 && bool2 && bool3 && bool4) {
+        if (qcsLossDetailDoList.size() > 0) {
+            bool5 = qcsLossDetailService.saveBatch(qcsLossDetailDoList);
+        }
+        if (bool1 && bool2 && bool3 && bool4 && bool5) {
             return R.ok();
         } else {
             return R.error();

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsLossDetailDo.java

@@ -0,0 +1,178 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("qcs_loss_detail")
+public class QcsLossDetailDo extends BaseDo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 主表ID
+     */
+    private String mainid;
+
+    /**
+     * 项目工号ID
+     */
+    private String proid;
+
+    /**
+     * 项目工号
+     */
+    private String procode;
+
+    /**
+     * 项目名称
+     */
+    private String proname;
+
+    /**
+     * 部件图号ID
+     */
+    private String partnoid;
+
+    /**
+     * 部件图号
+     */
+    private String partno;
+
+    /**
+     * 部件名称
+     */
+    private String partname;
+
+    /**
+     * 编号
+     */
+    private String lossno;
+
+    /**
+     * 事故问题概述
+     */
+    private String lossinfo;
+
+    /**
+     * 科目1
+     */
+    private BigDecimal subject1;
+
+    /**
+     * 科目2
+     */
+    private BigDecimal subject2;
+
+    /**
+     * 科目3
+     */
+    private BigDecimal subject3;
+
+    /**
+     * 科目4
+     */
+    private BigDecimal subject4;
+
+    /**
+     * 科目5
+     */
+    private BigDecimal subject5;
+
+    /**
+     * 科目6
+     */
+    private BigDecimal subject6;
+
+    /**
+     * 科目7
+     */
+    private BigDecimal subject7;
+
+    /**
+     * 科目8
+     */
+    private BigDecimal subject8;
+
+    /**
+     * 科目9
+     */
+    private BigDecimal subject9;
+
+    /**
+     * 科目10
+     */
+    private BigDecimal subject10;
+
+    /**
+     * 科目11
+     */
+    private BigDecimal subject11;
+
+    /**
+     * 科目12
+     */
+    private BigDecimal subject12;
+
+    /**
+     * 科目13
+     */
+    private BigDecimal subject13;
+
+    /**
+     * 科目14
+     */
+    private BigDecimal subject14;
+
+    /**
+     * 科目15
+     */
+    private BigDecimal subject15;
+
+    /**
+     * 科目16
+     */
+    private BigDecimal subject16;
+
+    /**
+     * 科目17
+     */
+    private BigDecimal subject17;
+
+    /**
+     * 科目18
+     */
+    private BigDecimal subject18;
+
+    /**
+     * 科目19
+     */
+    private BigDecimal subject19;
+
+    /**
+     * 科目20
+     */
+    private BigDecimal subject20;
+
+    /**
+     * 合计金额(元)
+     */
+    private BigDecimal totalcost;
+
+    /**
+     * 提交时间
+     */
+    private Date submitdate;
+}