Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java

@@ -45,8 +45,10 @@ public class OrderDetailDto implements Serializable {
 
     private String price;
 
-    private BigDecimal planTotalPrice;
+    //预计金额
+    private BigDecimal totalPrice;
 
+    //实际金额
     private BigDecimal actualTotalPrice;
 
     private String detailJson;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java

@@ -39,8 +39,10 @@ public class OrderDetailReq extends BaseRequest {
 
     private String price;
 
-    private BigDecimal planTotalPrice;
+    //计划金额
+    private BigDecimal totalPrice;
 
+    //实际金额
     private BigDecimal actualTotalPrice;
 
     private String detailJson;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgCountReq.java

@@ -21,4 +21,7 @@ public class TjOrgCountReq extends BaseRequest {
     private Boolean removeEmpty;
     private String typeParentId;
     private Integer levelNum;
+
+    private String order;
+    private String column;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderDetailReq.java

@@ -46,8 +46,9 @@ public class UpdateOrderDetailReq implements Serializable {
     private Integer  planNum;
     private String price;
 
-    private BigDecimal planTotalPrice;
-
+    //计划预计金额
+    private BigDecimal totalPrice;
+    //实际金额
     private BigDecimal actualTotalPrice;
     private String detailJson;
 

jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java

@@ -219,6 +219,8 @@ public class InventorySummary implements Serializable {
     @TableField(value = "property")
     private Integer property;
 
+    @TableField(exist = false)
+    private String picture;
 
 
     private static final long serialVersionUID = 1L;

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java

@@ -61,8 +61,8 @@ import java.util.Date;
         @TableField("price")
         private String price;
 
-        @TableField("plan_total_price")
-        private BigDecimal planTotalPrice;
+        @TableField("total_price")
+        private BigDecimal totalPrice;
 
         @TableField("actual_total_price")
         private BigDecimal actualTotalPrice;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -107,6 +107,33 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         }
         LambdaQueryWrapper<InventorySummary> wp = createWrapper(req);//取出仓库中总数并计算
         Page<InventorySummary> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wp);
+        List<InventorySummary> records = page.getRecords();
+        LambdaQueryWrapper<EquipmentSize> wrapper = new LambdaQueryWrapper<>();
+        Map<String,String> map=new HashMap<>();
+        for (InventorySummary is:records) {
+            String key=is.getTypeId()+"_"+is.getSizeId();
+            if (!map.containsKey(key)){
+                map.put(key,"1");
+            }
+        }
+        // 使用 keySet 遍历
+        //取出map中的所有进行遍历
+        for (String key : map.keySet()) {
+            String[] s = key.split("_");
+            String typeId=s[0];
+            String sizeId=s[1];
+            wrapper.or().eq(EquipmentSize::getTypeId,typeId).eq(EquipmentSize::getId,sizeId);
+        }
+        List<EquipmentSize> equipmentSizeList = equipmentSizeService.list(wrapper);
+        for (InventorySummary is:records) {
+            for (EquipmentSize size:equipmentSizeList) {
+                if (is.getSizeId().equals(size.getId())&& is.getTypeId().equals(size.getTypeId())){
+                    is.setPicture(size.getPhoto());
+                    break;
+                }
+            }
+        }
+        page.setRecords(records);
         return PageResultFactory.createPageResult(page);
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -228,7 +228,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             detail.setType(order.getOrderType());
             //将数量和价格进行累加
             sumNum += detail.getPlanNum();
-            priceTotal = priceTotal.add(BigDecimal.valueOf(detail.getPlanNum()).multiply(detail.getPlanTotalPrice())) ;
+            priceTotal = priceTotal.add(BigDecimal.valueOf(detail.getPlanNum()).multiply(detail.getTotalPrice())) ;
             detail.setCreateTime(DateTimeUtil.getCurrentDateTime());
             String productionDate = listReq.getProductionDate();
             if (ObjectUtil.isNotNull(productionDate) && !productionDate.trim().isEmpty()){

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -558,6 +559,27 @@ public class TjServiceImpl implements TjService {
     }
 
 
+    //自定义排序规则（根据某个字段值进行排序）
+    public <T> Comparator<T> createColumnOrderComparator(String column,String order) {
+        return (object1, object2) -> {
+            try {
+                Field field = object1.getClass().getDeclaredField(column);
+                field.setAccessible(true);
+                Object fieldValue1 = field.get(object1);
+                Object fieldValue2 = field.get(object2);
+
+                if (fieldValue1 instanceof Comparable && fieldValue2 instanceof Comparable) {
+                    int result = ((Comparable) fieldValue1).compareTo(fieldValue2);
+                    return order.equalsIgnoreCase("desc") ? -result : result;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return 0;
+        };
+    }
+
+
     public <T> Comparator<T> createOrgComparator() {
         return (org1,org2) ->{
 
@@ -615,6 +637,7 @@ public class TjServiceImpl implements TjService {
 
     @Override
     public PageResult<TjOrgCountDto> TjOrgCount(TjOrgCountReq req) {
+
         //先拿到符合条件的组织机构，再遍历组织机构组成数据
         //（下一层数据组织机构数据）
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
@@ -670,7 +693,8 @@ public class TjServiceImpl implements TjService {
 
         if (req.getOrgId()!=1369509498032808905L){
             TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCountleve4(req.getOrgId(),
-                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),req.getMonthList(),pubOrg.getLevelFlag());
+                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
+                    req.getMonthList(),pubOrg.getLevelFlag());
             tjOrgCountList.add(orgData);
         }
 
@@ -680,8 +704,16 @@ public class TjServiceImpl implements TjService {
         }
 
         //对组织机构进行排序
+        //判断是否有排序规则，如果有排序规则且排序规则不是create_time desc，那么直接按照排序规则进行排序，否则按照默认的组织机构code编码进行排序
+        if ((req.getColumn().equals("createTime") && req.getOrder().equals("desc")) ||
+                (req.getColumn().equals("createTime") && req.getOrder().equals("asc"))){
             Comparator<TjOrgCountDto> orgComparator = createOrgComparator();
             Collections.sort(tjOrgCountList, orgComparator);
+        }else {
+            Comparator<Object> columnOrderComparator = createColumnOrderComparator(req.getColumn(), req.getOrder());
+            Collections.sort(tjOrgCountList, columnOrderComparator);
+        }
+
         Page<TjOrgCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
         if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
             req.setPageNo(1L);
@@ -697,6 +729,7 @@ public class TjServiceImpl implements TjService {
 
     @Override
     public FinalTjOrgCountDto TjOrgCountSum(TjOrgCountReq req) {
+
         FinalTjOrgCountDto finalTjOrgCountDto=new FinalTjOrgCountDto();
         finalTjOrgCountDto.setFixCount(0);
         finalTjOrgCountDto.setUseCount(0);
@@ -706,7 +739,8 @@ public class TjServiceImpl implements TjService {
         List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
         for (String orgId:orgList) {
             TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCount(orgId,
-                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),req.getMonthList());
+                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
+                    req.getMonthList());
             orgData.setNumber(ObjectUtil.isNull(orgData.getNumber())?0:orgData.getNumber());
             orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount())?0:orgData.getUseCount());
             orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount())?0:orgData.getFixCount());
@@ -714,7 +748,8 @@ public class TjServiceImpl implements TjService {
         }
         if (req.getOrgId()!=1369509498032808905L){
             TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCountleve4(req.getOrgId(),
-                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),req.getMonthList(),pubOrg.getLevelFlag());
+                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
+                    req.getMonthList(),pubOrg.getLevelFlag());
             tjOrgCountList.add(orgData);
         }
         for (TjOrgCountDto tj:tjOrgCountList) {
@@ -731,7 +766,8 @@ public class TjServiceImpl implements TjService {
     @Override
     public List<TjOrgCountDto> TjOrgCountDetail(TjOrgCountReq req) {
         List<TjOrgCountDto> tjOrgCountDtoList=equipmentCountSummaryMapper.TjOrgCountTotalNum(req.getOrgId(),
-                req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),req.getMonthList(),req.getLevelNum());
+                req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
+                req.getMonthList(),req.getLevelNum());
         if (req.getRemoveEmpty()){
             tjOrgCountDtoList.removeIf(tjOrgCountDto -> tjOrgCountDto.getNumber()==0 );
         }
@@ -740,7 +776,8 @@ public class TjServiceImpl implements TjService {
 
     @Override
     public PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req) {
-        int size = equipmentCountSummaryMapper.TjOrgCountDetailSum(req.getOrgId(),req.getYear(),req.getTypeIdsList(),req.getSizeNameList());
+        int size = equipmentCountSummaryMapper.TjOrgCountDetailSum(req.getOrgId(),req.getYear(),
+                req.getTypeIdsList(),req.getSizeNameList());
         if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
             req.setPageNo(1L);
             req.setPageSize(10L);

jyzb-biz/src/main/resources/mapper/OrderMainService.xml → jyzb-biz/src/main/resources/mapper/OrderNumMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="generator.mapper.OrderNumMapper">
+<mapper namespace="com.junmp.jyzb.mapper.OrderNumMapper">
 
     <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.OrderNum">
             <id property="id" column="id" jdbcType="INTEGER"/>