价格行情趋势图 修改少一天的问题 砂石类型趋势图增加砂石种类的类型字段

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java

@@ -481,7 +481,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
             startValue= forValue.get(dinasTypeId + stationId.toString());
         }else{
             if(null != adjustmentStartDate){
-                startDate = adjustmentStartDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                startDate = adjustmentStartDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(-1);
             }else{
                 startDate = nowDate;
             }

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java

@@ -174,7 +174,7 @@ public class PriceAdjustmentController {
         }
         KObject priceAdjustment = priceAdjustmentService.validateByStationId(id);
         if(null!=priceAdjustment){
-            return ResponseObj.error("有正在审批的数据,不可新建", priceAdjustment);
+            return ResponseObj.error("有正在审批或审批不通过的数据,不可新建", priceAdjustment);
 
         }
         return ResponseObj.success("可以新增");
@@ -230,7 +230,6 @@ public class PriceAdjustmentController {
      * 数据相同时候的提示
      * @return
      */
-
     @GetMapping("getSameMessageById")
     public ResponseObj getSameById(@RequestParam("id") UUID id){
         KObject byId = priceAdjustmentService.getById(id);

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/entity/DinasTypeParent.java

@@ -10,8 +10,16 @@ public class DinasTypeParent {
 
     private UUID dinasTypeId;
     private String dinasTypeName;
+    private Integer typeType;
     private List<TimeValueParentEntity> timeValueParentEntityList;
 
+    public Integer getTypeType() {
+        return typeType;
+    }
+
+    public void setTypeType(Integer typeType) {
+        this.typeType = typeType;
+    }
 
     public UUID getDinasTypeId() {
         return dinasTypeId;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/ProductionPlanReportDaoImpl.java

@@ -270,6 +270,8 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
             add.add(Projections.alias(Projections.groupProperty("dinasType.dinasTypeName"), "dinasTypeName"));
             add.add(Projections.alias(
                     Projections.groupProperty("dinasType.id"), "dinasTypeId"));
+            add.add(Projections.alias(
+                    Projections.groupProperty("dinasType.type"), "typeType"));
         }
 
         if (!CollectionUtils.isEmpty(ids)) {

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/ProductionPlanReportServiceImpl.java

@@ -289,6 +289,7 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
             UUID productionLineId = UUID.fromString(stringObjectMap.get("productionLineId").toString());
             UUID dinasTypeId = UUID.fromString(stringObjectMap.get("dinasTypeId").toString());
             String dinasTypeName = stringObjectMap.get("dinasTypeName").toString();
+            String typeType = stringObjectMap.get("typeType").toString();
             String productionLineName = stringObjectMap.get("productionLineName").toString();
             Double sumDinasWeight = Double.parseDouble(stringObjectMap.get("sumDinasWeight").toString());
 
@@ -301,6 +302,7 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
                 DinasTypeParent productionLineEchart = new DinasTypeParent();
                 productionLineEchart.setDinasTypeId(dinasTypeId);
                 productionLineEchart.setDinasTypeName(dinasTypeName);
+                productionLineEchart.setTypeType(Integer.parseInt(typeType));
                 productionLineEchart.setTimeValueParentEntityList(new ArrayList<>());
                 dinasTypeMap.put(dinasTypeId,productionLineEchart);
                 dinasTypeParents.add(productionLineEchart);

backend/xyst.dinas.safe/src/main/resources/config/SafeLog.hbm.xml

@@ -101,7 +101,7 @@
             </column>
         </property>
 
-        <property name="approvalTime" type="timestamp" not-null="true">
+        <property name="approvalTime" type="timestamp" not-null="false">
             <column name="approval_time">
                 <comment>审批时间</comment>
             </column>

backend/xyst.dinas.transport/src/main/model/com/xyst/dinas/transport/query/TransportRecord.mk

@@ -8,23 +8,23 @@
         <description></description>
     </header>
     <content>
-        <customQuery id='c3040cd8-5faa-4f83-bdf7-d2251dd884c7'>
+        <customQuery id='d78b6275-39f8-41fa-8d89-cd6502d9493b'>
             <kclass>com.xyst.dinas.transport.datamodel.TransportRecord</kclass>
             <authorityItem></authorityItem>
             <innerScene title='全部'>
-                <id>9e4f14fa-0db7-41ba-ba85-9586572bdcd8</id>
+                <id>73c09a52-f23b-469f-a79c-33c51dddd0c3</id>
                 <javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
                 <defaultExecute></defaultExecute>
                 <hide></hide>
             </innerScene>
             <innerScene title='已废弃'>
-                <id>fe7934d2-0cd6-4f50-a961-2938b741af6a</id>
+                <id>782edfab-6610-4afe-a76f-0404beb2f88e</id>
                 <javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
                 <defaultExecute></defaultExecute>
                 <hide></hide>
             </innerScene>
             <innerScene title='权限过滤'>
-                <id>6fce9908-901b-491c-9508-5deb75e8aadc</id>
+                <id>f017a930-c663-4d7d-b6f4-a4e81f8c396d</id>
                 <javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</javaImplement>
                 <defaultExecute>true</defaultExecute>
                 <hide>true</hide>