Browse Source

客诉 word 导出

turujie 2 years ago
parent
commit
ebc0c773a1
20 changed files with 1133 additions and 4 deletions
  1. 3 0
      business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComCustomerDao.java
  2. 17 0
      business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComMetalConfigDao.java
  3. 17 0
      business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComMetalFinanceItemDao.java
  4. 17 0
      business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComMetalFinanceRecheckItemDao.java
  5. 3 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/ComCustomerService.java
  6. 17 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/ComMetalConfigService.java
  7. 16 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/ComMetalFinanceItemService.java
  8. 15 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/ComMetalFinanceRecheckItemService.java
  9. 126 3
      business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComCustomerServiceImpl.java
  10. 19 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComMetalConfigServiceImpl.java
  11. 20 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComMetalFinanceItemServiceImpl.java
  12. 30 0
      business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComMetalFinanceRecheckItemServiceImpl.java
  13. 119 0
      business-entity/src/main/java/com/bsentity/domin/ComMetalConfigDo.java
  14. 256 0
      business-entity/src/main/java/com/bsentity/domin/ComMetalFinanceItemDo.java
  15. 262 0
      business-entity/src/main/java/com/bsentity/domin/ComMetalFinanceRecheckItemDo.java
  16. 106 0
      business-entity/src/main/java/com/bsentity/vo/ComProductVo.java
  17. 3 0
      business-entity/src/main/resources/mybatis/ComCustomerDao.xml
  18. 47 0
      business-entity/src/main/resources/mybatis/ComMetalFinanceItemDao.xml
  19. 39 0
      business-server/src/main/java/com/rongwei/controller/ComCustomerController.java
  20. 1 1
      business-server/src/main/resources/logback-spring.xml

+ 3 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComCustomerDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bsentity.domin.ComCustomerDo;
 import com.bsentity.dto.ComExportMasterDto;
 import com.bsentity.dto.ComProductExportDto;
+import com.bsentity.vo.ComProductVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,6 @@ public interface ComCustomerDao extends BaseMapper<ComCustomerDo> {
     List<ComProductExportDto> getProductByIds(@Param("ids") List<String> ids);
 
     void updatePrintNoByIds(@Param("ids") List<String> ids , @Param("printNo") String printNo);
+
+    int insertFinance(@Param("comProductVos") List<ComProductVo> comProductVos);
 }

+ 17 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComMetalConfigDao.java

@@ -0,0 +1,17 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bsentity.domin.ComMetalConfigDo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 金属配置表 Mapper 接口
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Mapper
+public interface ComMetalConfigDao extends BaseMapper<ComMetalConfigDo> {
+}

+ 17 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComMetalFinanceItemDao.java

@@ -0,0 +1,17 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bsentity.domin.ComMetalFinanceItemDo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客诉财务预估明细 Mapper 接口
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Mapper
+public interface ComMetalFinanceItemDao extends BaseMapper<ComMetalFinanceItemDo> {
+}

+ 17 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/dao/ComMetalFinanceRecheckItemDao.java

@@ -0,0 +1,17 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bsentity.domin.ComMetalFinanceRecheckItemDo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客诉复核 Mapper 接口
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Mapper
+public interface ComMetalFinanceRecheckItemDao extends BaseMapper<ComMetalFinanceRecheckItemDo> {
+}

+ 3 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ComCustomerService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsentity.domin.ComCustomerDo;
 import com.bsentity.dto.ComExportMasterDto;
 import com.bsentity.dto.ComProductExportDto;
+import com.bsentity.vo.ComProductVo;
+import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface ComCustomerService extends IService<ComCustomerDo> {
 
     void updatePrintNoByIds(List<String> ids,String printNo);
 
+    R addComProduct(List<ComProductVo> comProductVos);
 }

+ 17 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ComMetalConfigService.java

@@ -0,0 +1,17 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsentity.domin.ComMetalConfigDo;
+
+/**
+ * <p>
+ * 金属配置表 服务类
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+public interface ComMetalConfigService extends IService<ComMetalConfigDo> {
+
+}
+

+ 16 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ComMetalFinanceItemService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsentity.domin.ComMetalFinanceItemDo;
+
+/**
+ * <p>
+ * 客诉财务预估明细 服务类
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+public interface ComMetalFinanceItemService extends IService<ComMetalFinanceItemDo> {
+
+}

+ 15 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ComMetalFinanceRecheckItemService.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsentity.domin.ComMetalFinanceRecheckItemDo;
+
+/**
+ * <p>
+ * 客诉复核 服务类
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+public interface ComMetalFinanceRecheckItemService extends IService<ComMetalFinanceRecheckItemDo> {
+}

+ 126 - 3
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComCustomerServiceImpl.java

@@ -1,14 +1,35 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsentity.domin.ComCustomerDo;
+import com.bsentity.domin.ComMetalConfigDo;
+import com.bsentity.domin.ComMetalFinanceItemDo;
+import com.bsentity.domin.ComMetalFinanceRecheckItemDo;
 import com.bsentity.dto.ComExportMasterDto;
 import com.bsentity.dto.ComProductExportDto;
+import com.bsentity.vo.ComProductVo;
 import com.rongwei.bscommon.sys.dao.ComCustomerDao;
 import com.rongwei.bscommon.sys.service.ComCustomerService;
+import com.rongwei.bscommon.sys.service.ComMetalConfigService;
+import com.rongwei.bscommon.sys.service.ComMetalFinanceItemService;
+import com.rongwei.bscommon.sys.service.ComMetalFinanceRecheckItemService;
+import com.rongwei.commonservice.service.RedisService;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,9 +41,18 @@ import java.util.List;
  * @since 2023-07-12
  */
 @Service
-public class ComCustomerServiceImpl extends ServiceImpl<ComCustomerDao,ComCustomerDo> implements ComCustomerService {
+public class ComCustomerServiceImpl extends ServiceImpl<ComCustomerDao, ComCustomerDo> implements ComCustomerService {
 
 
+    @Autowired
+    private ComMetalConfigService comMetalConfigService;
+    @Autowired
+    private ComMetalFinanceRecheckItemService comMetalFinanceRecheckItemService;
+    @Autowired
+    private ComMetalFinanceItemService comMetalFinanceItemService;
+    @Autowired
+    private RedisService redisService;
+
     @Override
     public ComExportMasterDto getCustomerByIds(List<String> ids) {
 
@@ -36,7 +66,100 @@ public class ComCustomerServiceImpl extends ServiceImpl<ComCustomerDao,ComCustom
     }
 
     @Override
-    public void updatePrintNoByIds(List<String> ids,String printNo) {
-        baseMapper.updatePrintNoByIds(ids,printNo);
+    public void updatePrintNoByIds(List<String> ids, String printNo) {
+        baseMapper.updatePrintNoByIds(ids, printNo);
+    }
+
+    @Override
+    public R addComProduct(List<ComProductVo> comProductVos) {
+        if (ArrayUtil.isEmpty(comProductVos) || comProductVos.size() == 0) {
+            return R.error("新增数据为空");
+        }
+
+        // 获取 年份 月份
+        String year = String.valueOf(DateUtil.year(new Date()));
+        String month =  "0" + (DateUtil.month(new Date())+1);
+        // 获取当月金属价格
+        ComMetalConfigDo comMetalConfigDo = comMetalConfigService.getBaseMapper().selectOne(new LambdaQueryWrapper<ComMetalConfigDo>()
+                .eq(ComMetalConfigDo::getYear, year)
+                .eq(ComMetalConfigDo::getMonth, month)
+                .eq(ComMetalConfigDo::getDeleted , '0'));
+        if (ObjectUtil.isEmpty(comMetalConfigDo)){
+            return R.error("当月金属价格未配置");
+        }
+
+        List<ComMetalFinanceItemDo> comMetalFinanceItemDos = new ArrayList<>();
+        List<ComMetalFinanceRecheckItemDo> comMetalFinanceRecheckItemDos = new ArrayList<>();
+        SysUserVo currentUser = getCurrentUser();
+        for (ComProductVo comProductVo : comProductVos) {
+            // 循环拷贝数据 至  财务预估数据
+            ComMetalFinanceItemDo comMetalFinanceItemDo = new ComMetalFinanceItemDo();
+            comMetalFinanceItemDo.setId(SecurityUtil.getUUID());
+            comMetalFinanceItemDo.setCreatedate(new Date());
+            comMetalFinanceItemDo.setCreateuserid(currentUser.getCreateuserid());
+            comMetalFinanceItemDo.setCreateusername(currentUser.getCreateusername());
+            comMetalFinanceItemDo.setModifydate(new Date());
+            comMetalFinanceItemDo.setModifyuserid(currentUser.getCreateuserid());
+            comMetalFinanceItemDo.setModifyusername(currentUser.getCreateusername());
+            comMetalFinanceItemDo.setProductid(comProductVo.getID());
+            comMetalFinanceItemDo.setAlloy(comProductVo.getAlloy());
+            comMetalFinanceItemDo.setComweight(comProductVo.getComWeight());
+            comMetalFinanceItemDo.setDeliveryno(comProductVo.getDELIVERYNO());
+            comMetalFinanceItemDo.setIsstatus(comProductVo.getISSTATUS());
+            comMetalFinanceItemDo.setLongs(comProductVo.getLONGS());
+            comMetalFinanceItemDo.setOriorderno(comProductVo.getORIORDERNO());
+            comMetalFinanceItemDo.setThick(comProductVo.getTHICK());
+            comMetalFinanceItemDo.setVolumeno(comProductVo.getVOLUMENO());
+            comMetalFinanceItemDo.setMetalconfigid(comMetalConfigDo.getId());
+            comMetalFinanceItemDo.setCustomerid(comProductVo.getCustomerId());
+            comMetalFinanceItemDos.add(comMetalFinanceItemDo);
+
+            // 财务复核
+            ComMetalFinanceRecheckItemDo comMetalFinanceRecheckItemDo = new ComMetalFinanceRecheckItemDo();
+            comMetalFinanceRecheckItemDo.setId(SecurityUtil.getUUID());
+            comMetalFinanceRecheckItemDo.setCreatedate(new Date());
+            comMetalFinanceRecheckItemDo.setCreateuserid(currentUser.getCreateuserid());
+            comMetalFinanceRecheckItemDo.setCreateusername(currentUser.getCreateusername());
+            comMetalFinanceRecheckItemDo.setModifydate(new Date());
+            comMetalFinanceRecheckItemDo.setModifyuserid(currentUser.getCreateuserid());
+            comMetalFinanceRecheckItemDo.setModifyusername(currentUser.getCreateusername());
+            comMetalFinanceRecheckItemDo.setProductid(comProductVo.getID());
+            comMetalFinanceRecheckItemDo.setAlloy(comProductVo.getAlloy());
+            comMetalFinanceRecheckItemDo.setComweight(comProductVo.getComWeight());
+            comMetalFinanceRecheckItemDo.setDeliveryno(comProductVo.getDELIVERYNO());
+            comMetalFinanceRecheckItemDo.setIsstatus(comProductVo.getISSTATUS());
+            comMetalFinanceRecheckItemDo.setLongs(comProductVo.getLONGS());
+            comMetalFinanceRecheckItemDo.setOriorderno(comProductVo.getORIORDERNO());
+            comMetalFinanceRecheckItemDo.setThick(comProductVo.getTHICK());
+            comMetalFinanceRecheckItemDo.setVolumeno(comProductVo.getVOLUMENO());
+            comMetalFinanceRecheckItemDo.setMetalconfigid(comMetalConfigDo.getId());
+            comMetalFinanceRecheckItemDo.setCustomerid(comProductVo.getCustomerId());
+            comMetalFinanceRecheckItemDos.add(comMetalFinanceRecheckItemDo);
+        }
+        // 直接插入数据表 com_metal_finance_item
+        comMetalFinanceItemService.saveOrUpdateBatch(comMetalFinanceItemDos);
+        comMetalFinanceRecheckItemService.saveOrUpdateBatch(comMetalFinanceRecheckItemDos);
+        return R.ok();
+    }
+
+
+    /**
+     * 获取当前操作的用户
+     *
+     * @return
+     */
+    public SysUserVo getCurrentUser() {
+        SysUserVo currUser = null;
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            if (request != null) {
+                String token = request.getHeader("token");
+                if (com.rongwei.rwcommon.utils.StringUtils.isNotEmpty(token)) {
+                    currUser = redisService.getLoginUser(token);
+                }
+            }
+        }
+        return currUser;
     }
 }

+ 19 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComMetalConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsentity.domin.ComMetalConfigDo;
+import com.rongwei.bscommon.sys.dao.ComMetalConfigDao;
+import com.rongwei.bscommon.sys.service.ComMetalConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 金属配置表 服务实现类
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Service
+public class ComMetalConfigServiceImpl extends ServiceImpl<ComMetalConfigDao, ComMetalConfigDo> implements ComMetalConfigService {
+}

+ 20 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComMetalFinanceItemServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsentity.domin.ComMetalFinanceItemDo;
+import com.rongwei.bscommon.sys.dao.ComMetalFinanceItemDao;
+import com.rongwei.bscommon.sys.service.ComMetalFinanceItemService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客诉财务预估明细 服务实现类
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Service
+public class ComMetalFinanceItemServiceImpl extends ServiceImpl<ComMetalFinanceItemDao, ComMetalFinanceItemDo> implements ComMetalFinanceItemService {
+
+}

+ 30 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComMetalFinanceRecheckItemServiceImpl.java

@@ -0,0 +1,30 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsentity.domin.ComMetalFinanceRecheckItemDo;
+import com.rongwei.bscommon.sys.dao.ComMetalFinanceRecheckItemDao;
+import com.rongwei.bscommon.sys.service.ComMetalFinanceRecheckItemService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客诉复核 服务实现类
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Service
+public class ComMetalFinanceRecheckItemServiceImpl
+        extends ServiceImpl<ComMetalFinanceRecheckItemDao, ComMetalFinanceRecheckItemDo>
+        implements ComMetalFinanceRecheckItemService {
+
+
+
+
+
+
+
+
+
+}

+ 119 - 0
business-entity/src/main/java/com/bsentity/domin/ComMetalConfigDo.java

@@ -0,0 +1,119 @@
+package com.bsentity.domin;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 金属配置表
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("com_metal_config")
+public class ComMetalConfigDo implements Serializable {
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 是否删除Y/N
+     */
+    @TableField("DELETED")
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    @TableField("REMARK")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATEDATE")
+    private Date createdate;
+
+    /**
+     * 创建用户ID
+     */
+    @TableField("CREATEUSERID")
+    private String createuserid;
+
+    /**
+     * 修改日期
+     */
+    @TableField("MODIFYDATE")
+    private Date modifydate;
+
+    /**
+     * 修改用户ID
+     */
+    @TableField("MODIFYUSERID")
+    private String modifyuserid;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATEUSERNAME")
+    private String createusername;
+
+    /**
+     * 修改人
+     */
+    @TableField("MODIFYUSERNAME")
+    private String modifyusername;
+
+    /**
+     * 年
+     */
+    @TableField("YEAR")
+    private String year;
+
+    /**
+     * 月
+     */
+    @TableField("MONTH")
+    private String month;
+
+    /**
+     * 金属价格
+     */
+    @TableField("METALPRICE")
+    private BigDecimal metalprice;
+
+    /**
+     * 报废损失率
+     */
+    @TableField("LOSSRATE")
+    private BigDecimal lossrate;
+
+}

+ 256 - 0
business-entity/src/main/java/com/bsentity/domin/ComMetalFinanceItemDo.java

@@ -0,0 +1,256 @@
+package com.bsentity.domin;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 客诉财务预估明细
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("com_metal_finance_item")
+public class ComMetalFinanceItemDo implements Serializable {
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 是否删除Y/N
+     */
+    @TableField("DELETED")
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    @TableField("REMARK")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATEDATE")
+    private Date createdate;
+
+    /**
+     * 创建用户ID
+     */
+    @TableField("CREATEUSERID")
+    private String createuserid;
+
+    /**
+     * 修改日期
+     */
+    @TableField("MODIFYDATE")
+    private Date modifydate;
+
+    /**
+     * 修改用户ID
+     */
+    @TableField("MODIFYUSERID")
+    private String modifyuserid;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATEUSERNAME")
+    private String createusername;
+
+    /**
+     * 修改人
+     */
+    @TableField("MODIFYUSERNAME")
+    private String modifyusername;
+
+    /**
+     * 预估损失日期
+     */
+    @TableField("ESTIMATEDLOSSDATE")
+    private Date estimatedlossdate;
+
+    /**
+     * 加工收入单价
+     */
+    @TableField("PROCESSUNITPRICE")
+    private BigDecimal processunitprice;
+
+    /**
+     * 加工成本单价
+     */
+    @TableField("COSTUNITPRICE")
+    private BigDecimal costunitprice;
+
+    /**
+     * 金属损失金额
+     */
+    @TableField("METALPRICELOSS")
+    private BigDecimal metalpriceloss;
+
+    /**
+     * 运费单价
+     */
+    @TableField("FREIGHTUNITPRICE")
+    private BigDecimal freightunitprice;
+
+    /**
+     * 运费损失
+     */
+    @TableField("FREIGHTLOSS")
+    private BigDecimal freightloss;
+
+    /**
+     * 计算总计(人民币)
+     */
+    @TableField("TOTALCOSTRMB")
+    private BigDecimal totalcostrmb;
+
+    /**
+     * 外汇汇率
+     */
+    @TableField("EXCHANGERATE")
+    private BigDecimal exchangerate;
+
+    /**
+     * 计算总计(美元)
+     */
+    @TableField("PRICETOTALUSD")
+    private BigDecimal pricetotalusd;
+
+    /**
+     * 其他费用(人民币)
+     */
+    @TableField("OTHERCOSTRMB")
+    private BigDecimal othercostrmb;
+
+    /**
+     * 其他费用(美元)
+     */
+    @TableField("OTHERCOSTUSD")
+    private BigDecimal othercostusd;
+
+    /**
+     * 单kg损失金额(美元)
+     */
+    @TableField("UNITKGPRICELOSSUSD")
+    private BigDecimal unitkgpricelossusd;
+
+    /**
+     * 金属配置ID
+     */
+    @TableField("METALCONFIGID")
+    private String metalconfigid;
+
+    /**
+     * 主表ID
+     */
+    @TableField("CUSTOMERID")
+    private String customerid;
+
+    /**
+     * 合金
+     */
+    @TableField("ALLOY")
+    private String alloy;
+
+    /**
+     * 状态
+     */
+    @TableField("ISSTATUS")
+    private String isstatus;
+
+    /**
+     * 规格(厚)
+     */
+    @TableField("THICK")
+    private BigDecimal thick;
+
+    /**
+     * 规格(宽)
+     */
+    @TableField("WIDE")
+    private BigDecimal wide;
+
+    /**
+     * 规格(长)
+     */
+    @TableField("LONGS")
+    private BigDecimal longs;
+
+    /**
+     * 卷号
+     */
+    @TableField("VOLUMENO")
+    private String volumeno;
+
+    /**
+     * 投诉重量
+     */
+    @TableField("COMWEIGHT")
+    private BigDecimal comweight;
+
+    /**
+     * MRA重量
+     */
+    @TableField("MRAWEIGHT")
+    private BigDecimal mraweight;
+
+    /**
+     * 类型
+     */
+    @TableField("TYPE")
+    private String type;
+
+    /**
+     * 最终重量
+     */
+    @TableField("FINALWEIGHT")
+    private BigDecimal finalweight;
+
+    /**
+     * 交货编号
+     */
+    @TableField("DELIVERYNO")
+    private String deliveryno;
+
+    /**
+     * 原订单号
+     */
+    @TableField("ORIORDERNO")
+    private String oriorderno;
+
+    /**
+     * 客诉产品ID
+     */
+    @TableField("PRODUCTID")
+    private String productid;
+}

+ 262 - 0
business-entity/src/main/java/com/bsentity/domin/ComMetalFinanceRecheckItemDo.java

@@ -0,0 +1,262 @@
+package com.bsentity.domin;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 客诉复核
+ * </p>
+ *
+ * @author trj
+ * @since 2023-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("com_metal_finance_recheck_item")
+public class ComMetalFinanceRecheckItemDo implements Serializable {
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 是否删除Y/N
+     */
+    @TableField("DELETED")
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    @TableField("REMARK")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATEDATE")
+    private Date createdate;
+
+    /**
+     * 创建用户ID
+     */
+    @TableField("CREATEUSERID")
+    private String createuserid;
+
+    /**
+     * 修改日期
+     */
+    @TableField("MODIFYDATE")
+    private Date modifydate;
+
+    /**
+     * 修改用户ID
+     */
+    @TableField("MODIFYUSERID")
+    private String modifyuserid;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATEUSERNAME")
+    private String createusername;
+
+    /**
+     * 修改人
+     */
+    @TableField("MODIFYUSERNAME")
+    private String modifyusername;
+
+    /**
+     * 预估损失日期
+     */
+    @TableField("ESTIMATEDLOSSDATE")
+    private Date estimatedlossdate;
+
+    /**
+     * 加工收入单价
+     */
+    @TableField("PROCESSUNITPRICE")
+    private BigDecimal processunitprice;
+
+    /**
+     * 加工成本单价
+     */
+    @TableField("COSTUNITPRICE")
+    private BigDecimal costunitprice;
+
+    /**
+     * 金属损失金额
+     */
+    @TableField("METALPRICELOSS")
+    private BigDecimal metalpriceloss;
+
+    /**
+     * 运费单价
+     */
+    @TableField("FREIGHTUNITPRICE")
+    private BigDecimal freightunitprice;
+
+    /**
+     * 运费损失
+     */
+    @TableField("FREIGHTLOSS")
+    private BigDecimal freightloss;
+
+    /**
+     * 计算总计(人民币)
+     */
+    @TableField("TOTALCOSTRMB")
+    private BigDecimal totalcostrmb;
+
+    /**
+     * 外汇汇率
+     */
+    @TableField("EXCHANGERATE")
+    private BigDecimal exchangerate;
+
+    /**
+     * 计算总计(美元)
+     */
+    @TableField("PRICETOTALUSD")
+    private BigDecimal pricetotalusd;
+
+    /**
+     * 其他费用(人民币)
+     */
+    @TableField("OTHERCOSTRMB")
+    private BigDecimal othercostrmb;
+
+    /**
+     * 其他费用(美元)
+     */
+    @TableField("OTHERCOSTUSD")
+    private BigDecimal othercostusd;
+
+    /**
+     * 单kg损失金额(美元)
+     */
+    @TableField("UNITKGPRICELOSSUSD")
+    private BigDecimal unitkgpricelossusd;
+
+    /**
+     * 金属配置ID
+     */
+    @TableField("METALCONFIGID")
+    private String metalconfigid;
+
+    /**
+     * 客诉产品ID
+     */
+    @TableField("PRODUCTID")
+    private String productid;
+
+    /**
+     * 财务预估ID
+     */
+    @TableField("FINANCEID")
+    private String financeid;
+
+    /**
+     * 主表ID
+     */
+    @TableField("CUSTOMERID")
+    private String customerid;
+
+    /**
+     * 合金
+     */
+    @TableField("ALLOY")
+    private String alloy;
+
+    /**
+     * 状态
+     */
+    @TableField("ISSTATUS")
+    private String isstatus;
+
+    /**
+     * 规格(厚)
+     */
+    @TableField("THICK")
+    private BigDecimal thick;
+
+    /**
+     * 规格(宽)
+     */
+    @TableField("WIDE")
+    private BigDecimal wide;
+
+    /**
+     * 规格(长)
+     */
+    @TableField("LONGS")
+    private BigDecimal longs;
+
+    /**
+     * 卷号
+     */
+    @TableField("VOLUMENO")
+    private String volumeno;
+
+    /**
+     * 投诉重量
+     */
+    @TableField("COMWEIGHT")
+    private BigDecimal comweight;
+
+    /**
+     * MRA重量
+     */
+    @TableField("MRAWEIGHT")
+    private BigDecimal mraweight;
+
+    /**
+     * 类型
+     */
+    @TableField("TYPE")
+    private String type;
+
+    /**
+     * 最终重量
+     */
+    @TableField("FINALWEIGHT")
+    private BigDecimal finalweight;
+
+    /**
+     * 交货编号
+     */
+    @TableField("DELIVERYNO")
+    private String deliveryno;
+
+    /**
+     * 原订单号
+     */
+    @TableField("ORIORDERNO")
+    private String oriorderno;
+}

+ 106 - 0
business-entity/src/main/java/com/bsentity/vo/ComProductVo.java

@@ -0,0 +1,106 @@
+package com.bsentity.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 投诉产品vo
+ *
+ * @author Trj
+ */
+@Data
+public class ComProductVo implements Serializable {
+    @JsonProperty("final")
+    private static final Long serialVersionUID = 1L;
+
+    /**
+     * 合金
+     */
+
+    @JsonProperty("ALLOY")
+    private String alloy;
+
+    /**
+     * 投诉重量
+     */
+    @JsonProperty("COMWEIGHT")
+    private BigDecimal comWeight;
+
+    /**
+     * 客诉单ID
+     */
+    @JsonProperty("CUSTOMERID")
+    private String customerId;
+
+    /**
+     * 缺陷
+     */
+    @JsonProperty("DEFECT")
+    private String DEFECT;
+
+    /**
+     * 是否删除
+     */
+    @JsonProperty("DELETED")
+    private String DELETED;
+
+    /**
+     * 交货编号
+     */
+    @JsonProperty("DELIVERYNO")
+    private String DELIVERYNO;
+
+
+    /**
+     * 投诉产品ID
+     */
+    @JsonProperty("ID")
+    private String ID;
+
+    /**
+     * 状态
+     */
+    @JsonProperty("ISSTATUS")
+    private String ISSTATUS;
+
+
+    /**
+     * 规格(长)
+     */
+    @JsonProperty("LONGS")
+    private BigDecimal LONGS;
+
+    /**
+     * 原订单号
+     */
+    @JsonProperty("ORIORDERNO")
+    private String ORIORDERNO;
+
+    /**
+     * 编号
+     */
+    @JsonProperty("PRODUCTNO")
+    private String PRODUCTNO;
+
+    /**
+     * 规格(厚)
+     */
+    @JsonProperty("THICK")
+    private BigDecimal THICK;
+
+    /**
+     * 卷号
+     */
+    @JsonProperty("VOLUMENO")
+    private String 	VOLUMENO;
+
+    /**
+     * 规格(宽)
+     */
+    @JsonProperty("WIDE")
+    private BigDecimal WIDE;
+
+}

+ 3 - 0
business-entity/src/main/resources/mybatis/ComCustomerDao.xml

@@ -71,6 +71,9 @@
         <result column="COMTYPE" property="comtype" />
         <result column="PRINTNO" property="printNo" />
     </resultMap>
+    <insert id="insertFinance">
+        insert into
+    </insert>
 
 
     <!-- 通过主表ids 查询 客户、客诉单信息 -->

+ 47 - 0
business-entity/src/main/resources/mybatis/ComMetalFinanceItemDao.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ComMetalFinanceItemDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bsentity.domin.ComMetalFinanceItemDo">
+        <id column="ID" property="id" />
+        <result column="TENANTID" property="tenantid" />
+        <result column="ROPTION" property="roption" />
+        <result column="DELETED" property="deleted" />
+        <result column="REMARK" property="remark" />
+        <result column="CREATEDATE" property="createdate" />
+        <result column="CREATEUSERID" property="createuserid" />
+        <result column="MODIFYDATE" property="modifydate" />
+        <result column="MODIFYUSERID" property="modifyuserid" />
+        <result column="CREATEUSERNAME" property="createusername" />
+        <result column="MODIFYUSERNAME" property="modifyusername" />
+        <result column="ESTIMATEDLOSSDATE" property="estimatedlossdate" />
+        <result column="PROCESSUNITPRICE" property="processunitprice" />
+        <result column="COSTUNITPRICE" property="costunitprice" />
+        <result column="METALPRICELOSS" property="metalpriceloss" />
+        <result column="FREIGHTUNITPRICE" property="freightunitprice" />
+        <result column="FREIGHTLOSS" property="freightloss" />
+        <result column="TOTALCOSTRMB" property="totalcostrmb" />
+        <result column="EXCHANGERATE" property="exchangerate" />
+        <result column="PRICETOTALUSD" property="pricetotalusd" />
+        <result column="OTHERCOSTRMB" property="othercostrmb" />
+        <result column="OTHERCOSTUSD" property="othercostusd" />
+        <result column="UNITKGPRICELOSSUSD" property="unitkgpricelossusd" />
+        <result column="METALCONFIGID" property="metalconfigid" />
+        <result column="CUSTOMERID" property="customerid" />
+        <result column="ALLOY" property="alloy" />
+        <result column="ISSTATUS" property="isstatus" />
+        <result column="THICK" property="thick" />
+        <result column="WIDE" property="wide" />
+        <result column="LONGS" property="longs" />
+        <result column="VOLUMENO" property="volumeno" />
+        <result column="COMWEIGHT" property="comweight" />
+        <result column="MRAWEIGHT" property="mraweight" />
+        <result column="TYPE" property="type" />
+        <result column="FINALWEIGHT" property="finalweight" />
+        <result column="DELIVERYNO" property="deliveryno" />
+        <result column="ORIORDERNO" property="oriorderno" />
+        <result column="PRODUCTID" property="productid" />
+    </resultMap>
+
+</mapper>

+ 39 - 0
business-server/src/main/java/com/rongwei/controller/ComCustomerController.java

@@ -0,0 +1,39 @@
+package com.rongwei.controller;
+
+import com.bsentity.vo.ComProductVo;
+import com.rongwei.bscommon.sys.service.ComCustomerService;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 客诉单处理, 包括子表信息
+ * @author Trj
+ */
+
+@RestController
+@RequestMapping("finance")
+public class ComCustomerController {
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    private ComCustomerService customerService;
+
+    /**
+     * 索赔管理员登记
+     * @param comProductVos 新增的客诉产品
+     */
+    @PostMapping("add")
+    public R comProductListTempWord(@RequestBody List<ComProductVo> comProductVos ){
+        log.info("客诉单id Word导出 接口入参:{}",comProductVos);
+
+        return customerService.addComProduct(comProductVos);
+    }
+}

+ 1 - 1
business-server/src/main/resources/logback-spring.xml

@@ -13,7 +13,7 @@
         <Prudent>true</Prudent>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>
-                business-log/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
+                comCustomer-log/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
             </FileNamePattern>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">