修改

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/controller/DynamicWorkAuditdataController.java

@@ -51,6 +51,27 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     @Autowired
     IDynamicWorkAuditdataService dynamicWorkAuditdataService;
 
+    /**
+     * 动态秤报表
+     *
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/getCollectData/{startTime}/{endTime}")
+    public RESTfulResult getCollectData(@PathVariable String startTime, @PathVariable String endTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            sdf.parse(startTime);
+            sdf.parse(endTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new RuntimeException("日期格式化错误");
+        }
+        List<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.getCollectData(startTime, endTime);
+        return success(list);
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/mapper/DynamicWorkAuditdataMapper.java

@@ -13,4 +13,11 @@ public interface DynamicWorkAuditdataMapper extends IBaseMapper<DynamicWorkAudit
 
     List<DynamicWorkAuditdata> getUploadData(@Param("auditingTime1") String auditingTime1, @Param("auditingTime2") String auditingTime2);
 
+    /**
+     * 动态秤报表
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<DynamicWorkAuditdata> getCollectData(String startTime, String endTime);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/mapper/DynamicWorkAuditdataMapper.xml

@@ -893,4 +893,36 @@
         <include refid="select"/>
         where to_char(END_TIME,'yyyy-MM-dd HH24:mi:ss') between #{auditingTime1} and #{auditingTime2}
     </select>
+    <select id="getCollectData"
+            resultMap="BaseResultMap">
+        SELECT STATION_CODE,
+               STATION_NAME,
+               MATERIAL_CODE,
+               MATERIAL_NAME,
+               sum(WEIGHT) AS WEIGHT,
+               VALID_FLAG,
+               AUDITING_FLAG,
+               RECIEVER_CODE,
+               RECIEVER_NAME,
+               RECIEVER_TYPE,
+               SENDER_CODE,
+               SENDER_NAME,
+               SENDER_TYPE
+        FROM DYNAMIC_WORK_AUDITDATA
+        WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') between #{startTime} and #{endTime}
+          and AUDITING_FLAG = '1'
+          and VALID_FLAG = '1'
+        GROUP BY STATION_CODE,
+                 STATION_NAME,
+                 MATERIAL_CODE,
+                 MATERIAL_NAME,
+                 VALID_FLAG,
+                 AUDITING_FLAG,
+                 RECIEVER_CODE,
+                 RECIEVER_NAME,
+                 RECIEVER_TYPE,
+                 SENDER_CODE,
+                 SENDER_NAME,
+                 SENDER_TYPE
+    </select>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/service/IDynamicWorkAuditdataService.java

@@ -38,4 +38,12 @@ public interface IDynamicWorkAuditdataService extends IBaseService<DynamicWorkAu
     void cancelUpload(List<DynamicWorkAuditdata> list);
 
     void upload(List<DynamicWorkAuditdata> list);
+
+    /**
+     * 动态秤报表
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<DynamicWorkAuditdata> getCollectData(String startTime, String endTime);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/service/impl/DynamicWorkAuditdataServiceImpl.java

@@ -114,9 +114,9 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
             auditdata.setCreateManNo(UserUtil.getCurrentUserId());
             auditdata.setCreateManName(UserUtil.getCurrentUserName());
             auditdata.setCreateTime(new Date());
-            BigDecimal weight = dynamicWorkUpdataMapper.getWeightForAuditOrUnaudit(auditdata);
+//            BigDecimal weight = dynamicWorkUpdataMapper.getWeightForAuditOrUnaudit(auditdata);
             dynamicWorkUpdataMapper.setAudit(auditdata);
-            Assert.isTrue(weight.compareTo(auditdata.getWeight()) == 0, "数据不一致，请刷新页面并检查数据！");
+//            Assert.isTrue(weight.compareTo(auditdata.getWeight()) == 0, "数据不一致，请刷新页面并检查数据！");
             auditdata.setAuditingFlag("1");
             dynamicWorkAuditdataMapper.save(auditdata);
         }
@@ -142,9 +142,9 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
             Assert.isTrue(dynamicWorkAuditdata.getUploaded().equals("0"), "数据已上传，请先撤销上传:" + dynamicWorkAuditdata);
 //            Assert.isTrue(dynamicWorkAuditdata.getAuditingFlag()!=null && dynamicWorkAuditdata.getAuditingFlag().equals("1"), "数据未审核，不能撤销审核:" + dynamicWorkAuditdata);
             dynamicWorkAuditdataMapper.deleteByPrimaryKey(dynamicWorkAuditdata.getId());
-            BigDecimal weight = dynamicWorkUpdataMapper.getWeightForAuditOrUnaudit(dynamicWorkAuditdata);
+//            BigDecimal weight = dynamicWorkUpdataMapper.getWeightForAuditOrUnaudit(dynamicWorkAuditdata);
             dynamicWorkUpdataMapper.setUnAudit(dynamicWorkAuditdata);
-            Assert.isTrue(weight.compareTo(dynamicWorkAuditdata.getWeight()) == 0, "数据不一致，请刷新页面并检查数据！");
+//            Assert.isTrue(weight.compareTo(dynamicWorkAuditdata.getWeight()) == 0, "数据不一致，请刷新页面并检查数据！");
         }
     }
 
@@ -198,4 +198,16 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
 //        centernetService.upload(listDB);
 //        int a = 1/0;
     }
+
+    /**
+     * 动态秤报表
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Override
+    public List<DynamicWorkAuditdata> getCollectData(String startTime, String endTime) {
+        List<DynamicWorkAuditdata> list = dynamicWorkAuditdataMapper.getCollectData(startTime, endTime);
+        return list;
+    }
 }