修改

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

@@ -32,6 +32,7 @@ import java.util.List;
 
 /**
  * DynamicWorkAuditdata RESTful接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2022-02-08 02:48
  * 类描述
@@ -40,8 +41,8 @@ import java.util.List;
  * 作者：generator
  * 参考：
  * 描述：DynamicWorkAuditdata RESTful接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @RestController
 @RequestMapping("/${api.version}/dynamicworkauditdatas")
@@ -50,78 +51,78 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     @Autowired
     IDynamicWorkAuditdataService dynamicWorkAuditdataService;
 
-    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("dynamicworkauditdata:view")
     @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         PageList<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.queryForPage(parmas, pageNum, pageSize);
         return success(list);
     }
 
-    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("dynamicworkauditdata:view")
     @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         PageList<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
 
-    @ApiOperation(value="创建", notes="根据DynamicWorkAuditdata对象创建")
+    @ApiOperation(value = "创建", notes = "根据DynamicWorkAuditdata对象创建")
     @ApiImplicitParam(name = "dynamicWorkAuditdata", value = "详细实体dynamicWorkAuditdata", required = true, dataType = "DynamicWorkAuditdata")
     //@RequiresPermissions("dynamicworkauditdata:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute DynamicWorkAuditdata model){
+    public RESTfulResult add(@ModelAttribute DynamicWorkAuditdata model) {
         DynamicWorkAuditdata dynamicWorkAuditdata = dynamicWorkAuditdataService.add(model);
         return success(dynamicWorkAuditdata);
     }
 
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("dynamicworkauditdata:view")
     @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
+    public RESTfulResult get(@PathVariable String id) {
         DynamicWorkAuditdata dynamicWorkAuditdata = dynamicWorkAuditdataService.getById(id);
         return success(dynamicWorkAuditdata);
     }
 
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的dynamicWorkAuditdata信息来更新详细信息")
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的dynamicWorkAuditdata信息来更新详细信息")
     @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "dynamicWorkAuditdata", value = "详细实体dynamicWorkAuditdata", required = true, dataType = "DynamicWorkAuditdata")
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "dynamicWorkAuditdata", value = "详细实体dynamicWorkAuditdata", required = true, dataType = "DynamicWorkAuditdata")
     })
     //@RequiresPermissions("dynamicworkauditdata:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicWorkAuditdata model){
+    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicWorkAuditdata model) {
         model.setId(id);
         DynamicWorkAuditdata dynamicWorkAuditdata = dynamicWorkAuditdataService.modify(model);
         return success(dynamicWorkAuditdata);
     }
 
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("dynamicworkauditdata:delete")
     @DeleteMapping(value = "/{id}")//String
-    public RESTfulResult delete(@PathVariable String id){
-    	List<String> list = Arrays.asList(id.split(","));
-    	if(ListUtils.isNotEmpty(list)) {
-	    	List<String> ids = ListUtils.convertList(list);
-			  dynamicWorkAuditdataService.delete(ids);
-    	}
-      return success();
+    public RESTfulResult delete(@PathVariable String id) {
+        List<String> list = Arrays.asList(id.split(","));
+        if (ListUtils.isNotEmpty(list)) {
+            List<String> ids = ListUtils.convertList(list);
+            dynamicWorkAuditdataService.delete(ids);
+        }
+        return success();
     }
 
-    @ApiOperation(value="审核", notes="动态秤数据审核")
+    @ApiOperation(value = "审核", notes = "动态秤数据审核")
     @ApiImplicitParam(name = "list", value = "待审核数据", required = true, dataType = "List<AuditDataVO>")
     @PostMapping(value = "/audit/{date}")
-    public RESTfulResult audit(@PathVariable String date, @RequestBody List<AuditDataVO> list){
+    public RESTfulResult audit(@PathVariable String date, @RequestBody List<AuditDataVO> list) {
         Assert.isTrue(!CollectionUtils.isEmpty(list), "审核数据不能为空");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
@@ -131,17 +132,18 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
             throw new RuntimeException("日期格式不正确(yyyy-MM-dd)");
         }
         dynamicWorkAuditdataService.audit(date, list);
-        return success(null,"操作成功");
+        return success(null, "操作成功");
     }
 
     /**
      * 查询上传数据
+     *
      * @param auditingTime1
      * @param auditingTime2
      * @return
      */
     @GetMapping(value = "/getUploadData/{auditingTime1}/{auditingTime2}")
-    public RESTfulResult getUploadData(@PathVariable String auditingTime1, @PathVariable String auditingTime2){
+    public RESTfulResult getUploadData(@PathVariable String auditingTime1, @PathVariable String auditingTime2) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             sdf.parse(auditingTime1);
@@ -156,14 +158,19 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
 
     /**
      * 撤销审核的数据
+     *
      * @param list
      * @return
      */
     @ApiOperation(value = "撤销审核的数据", notes = "撤销审核的数据")
     @PostMapping(value = "/cancelAudit")
-    public RESTfulResult cancelAudit(@RequestBody List<DynamicWorkAuditdata> list){
-        dynamicWorkAuditdataService.cancelAudit(list);
-        return success(null,"审核数据撤销成功!");
+    public RESTfulResult cancelAudit(@RequestBody List<DynamicWorkAuditdata> list) {
+        try {
+            dynamicWorkAuditdataService.cancelAudit(list);
+            return success(null, "审核数据撤销成功!");
+        } catch (Exception e) {
+            return failed(null, "审核数据撤销失败：" + e.getMessage());
+        }
     }
 
     @ApiOperation(value = "导出上传数据到Excel", notes = "导出上传数据到Excel")
@@ -183,13 +190,13 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
 
     @ApiOperation(value = "撤销上传的数据", notes = "撤销上传的数据")
     @PostMapping(value = "/cancelUpload")
-    public RESTfulResult cancelUpload(@RequestBody List<DynamicWorkAuditdata> list){
+    public RESTfulResult cancelUpload(@RequestBody List<DynamicWorkAuditdata> list) {
         try {
             dynamicWorkAuditdataService.cancelUpload(list);
             return success(null, "撤销上传数据成功!");
         } catch (Exception exception) {
             System.err.println(exception.getMessage());
-            return failed(exception.getMessage(), "部分或全部数据撤销上传失败，请确认！");
+            return failed(null, exception.getMessage());
         }
     }
 
@@ -199,9 +206,9 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
         try {
             dynamicWorkAuditdataService.upload(list);
             return success("数据上传成功!");
-        }catch (Exception exception){
+        } catch (Exception exception) {
             System.err.println(exception.getMessage());
-            return failed(exception.getMessage(),"部分或全部数据上传失败，请确认！");
+            return failed(null, exception.getMessage());
         }
     }
 }

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

@@ -66,7 +66,7 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
 
     @Transactional
     @Override
-    public void audit(String date, List<AuditDataVO> list) {
+    public synchronized void audit(String date, List<AuditDataVO> list) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startTime = null;
         Date endTime = null;
@@ -89,6 +89,7 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
             Assert.isTrue(StringUtils.isNotBlank(auditDataVO.getSenderName()), "发货库房名称不能为空:" + auditDataVO);
             Assert.isTrue(StringUtils.isNotBlank(auditDataVO.getSenderType()), "发货点类型不能为空:" + auditDataVO);
             Assert.isTrue(Objects.nonNull(auditDataVO.getRzl()), "重量不能为空:" + auditDataVO);
+            Assert.isTrue(auditDataVO.getAuditingFlag() !=null && auditDataVO.getAuditingFlag().equals("0"), "数据已审核，不能重复审核！:" + auditDataVO);
             DynamicWorkAuditdata auditdata = new DynamicWorkAuditdata();
             auditdata.setStationCode(auditDataVO.getStationCode());
             auditdata.setStationName(auditDataVO.getStationName());
@@ -108,11 +109,14 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
             auditdata.setEndTime(endTime);
             auditdata.setUploaded("0");
             auditdata.setValidFlag("1");
+            auditdata.setAuditingFlag("1");
             auditdata.setCreateManNo(UserUtil.getCurrentUserId());
             auditdata.setCreateManName(UserUtil.getCurrentUserName());
             auditdata.setCreateTime(new Date());
             dynamicWorkAuditdataMapper.save(auditdata);
-            dynamicWorkUpdataMapper.setAudit(auditdata);
+            int count = dynamicWorkUpdataMapper.getCountForAuditOrUnaudit(auditdata);
+            int setAudit = dynamicWorkUpdataMapper.setAudit(auditdata);
+            Assert.isTrue(count == setAudit, "数据不一致，请刷新页面并检查数据是否已审核！");
         }
     }
 
@@ -131,16 +135,20 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
 
     @Transactional
     @Override
-    public void cancelAudit(List<DynamicWorkAuditdata> list) {
+    public synchronized void cancelAudit(List<DynamicWorkAuditdata> list) {
         for (DynamicWorkAuditdata dynamicWorkAuditdata : list) {
+            Assert.isTrue(dynamicWorkAuditdata.getUploaded().equals("0"), "数据已上传，请先撤销上传:" + dynamicWorkAuditdata);
+//            Assert.isTrue(dynamicWorkAuditdata.getAuditingFlag()!=null && dynamicWorkAuditdata.getAuditingFlag().equals("1"), "数据未审核，不能撤销审核:" + dynamicWorkAuditdata);
             dynamicWorkAuditdataMapper.deleteByPrimaryKey(dynamicWorkAuditdata.getId());
-            dynamicWorkUpdataMapper.setUnAudit(dynamicWorkAuditdata);
+            int count = dynamicWorkUpdataMapper.getCountForAuditOrUnaudit(dynamicWorkAuditdata);
+            int setUnAudit = dynamicWorkUpdataMapper.setUnAudit(dynamicWorkAuditdata);
+            Assert.isTrue(count == setUnAudit, "数据不一致，请刷新页面并检查数据！");
         }
     }
 
 //    @Transactional
     @Override
-    public void cancelUpload(List<DynamicWorkAuditdata> list) {
+    public synchronized void cancelUpload(List<DynamicWorkAuditdata> list) {
         Assert.isTrue(!CollectionUtils.isEmpty(list), "请选择需要撤销上传的数据!");
 //        List<String> ids = new ArrayList<>();
         for (DynamicWorkAuditdata auditdata : list) {
@@ -165,7 +173,7 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
 
 //    @Transactional
     @Override
-    public void upload(List<DynamicWorkAuditdata> list) {
+    public synchronized void upload(List<DynamicWorkAuditdata> list) {
         Assert.isTrue(!CollectionUtils.isEmpty(list), "请选择需要上传的数据!");
 //        List<DynamicWorkAuditdata> listDB = new ArrayList<>();
         for (DynamicWorkAuditdata auditdata : list) {

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.java

@@ -73,7 +73,7 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * 设置审核状态
      * @param auditdata
      */
-    void setAudit(DynamicWorkAuditdata auditdata);
+    int setAudit(DynamicWorkAuditdata auditdata);
 
     /**
      * 启用
@@ -109,5 +109,11 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * 取消审核状态
      * @param dynamicWorkAuditdata
      */
-    void setUnAudit(DynamicWorkAuditdata dynamicWorkAuditdata);
+    int setUnAudit(DynamicWorkAuditdata dynamicWorkAuditdata);
+
+    /**
+     * 查询审核或者取消审核的记录条数
+     * @param auditDataVO
+     */
+    int getCountForAuditOrUnaudit(DynamicWorkAuditdata auditDataVO);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.xml

@@ -861,6 +861,196 @@
         <result column="AUDITING_FLAG" jdbcType="VARCHAR" property="auditingFlag"/>
     </resultMap>
     <!--    查询待审核数据-->
+    <!--    <select id="getAuditData" resultMap="getAuditDataMap">-->
+    <!--        select a.STATION_CODE,-->
+    <!--               a.STATION_NAME,-->
+    <!--               a.MATERIAL_CODE,-->
+    <!--               a.MATERIAL_NAME,-->
+    <!--               a.RECIEVER_CODE,-->
+    <!--               a.RECIEVER_NAME,-->
+    <!--               a.RECIEVER_TYPE,-->
+    <!--               a.SENDER_CODE,-->
+    <!--               a.SENDER_NAME,-->
+    <!--               a.SENDER_TYPE,-->
+    <!--               b.B8,-->
+    <!--               c.B16,-->
+    <!--               d.B24,-->
+    <!--               a.VALID_FLAG,-->
+    <!--               a.AUDITING_FLAG-->
+    <!--        from (-->
+    <!--                 SELECT STATION_CODE,-->
+    <!--                        STATION_NAME,-->
+    <!--                        MATERIAL_CODE,-->
+    <!--                        MATERIAL_NAME,-->
+    <!--                        RECIEVER_CODE,-->
+    <!--                        RECIEVER_NAME,-->
+    <!--                        RECIEVER_TYPE,-->
+    <!--                        SENDER_CODE,-->
+    <!--                        SENDER_NAME,-->
+    <!--                        SENDER_TYPE,-->
+    <!--                        VALID_FLAG,-->
+    <!--                        AUDITING_FLAG-->
+    <!--                 FROM DYNAMIC_WORK_UPDATA-->
+    <!--                 WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}-->
+    <!--                   AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}-->
+    <!--&#45;&#45;                    AND VALID_FLAG = '1'-->
+    <!--&#45;&#45;                    AND AUDITING_FLAG = '0'-->
+    <!--                   AND STATION_NAME &lt;&gt; 'M1#皮带秤'-->
+    <!--                   AND STATION_NAME &lt;&gt; 'M1B#皮带秤'-->
+    <!--                 GROUP BY STATION_CODE,-->
+    <!--                          STATION_NAME,-->
+    <!--                          MATERIAL_CODE,-->
+    <!--                          MATERIAL_NAME,-->
+    <!--                          RECIEVER_CODE,-->
+    <!--                          RECIEVER_NAME,-->
+    <!--                          RECIEVER_TYPE,-->
+    <!--                          SENDER_CODE,-->
+    <!--                          SENDER_NAME,-->
+    <!--                          SENDER_TYPE,-->
+    <!--                          VALID_FLAG,-->
+    <!--                          AUDITING_FLAG-->
+    <!--             ) a-->
+    <!--                 LEFT JOIN-->
+    <!--             (SELECT STATION_CODE-->
+    <!--                   , STATION_NAME-->
+    <!--                   , MATERIAL_CODE-->
+    <!--                   , MATERIAL_NAME-->
+    <!--                   , RECIEVER_CODE-->
+    <!--                   , RECIEVER_NAME-->
+    <!--                   , RECIEVER_TYPE-->
+    <!--                   , SENDER_CODE-->
+    <!--                   , SENDER_NAME-->
+    <!--                   , SENDER_TYPE-->
+    <!--                   , VALID_FLAG-->
+    <!--                   , AUDITING_FLAG-->
+    <!--                   , sum(WEIGHT) B8-->
+    <!--              FROM DYNAMIC_WORK_UPDATA-->
+    <!--              WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}-->
+    <!--                AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl8end}-->
+    <!--&#45;&#45;                 AND VALID_FLAG = '1'-->
+    <!--&#45;&#45;                 AND AUDITING_FLAG = '0'-->
+    <!--                AND STATION_NAME &lt;&gt; 'M1#皮带秤'-->
+    <!--                AND STATION_NAME &lt;&gt; 'M1B#皮带秤'-->
+    <!--              GROUP BY STATION_CODE,-->
+    <!--                       STATION_NAME,-->
+    <!--                       MATERIAL_CODE,-->
+    <!--                       MATERIAL_NAME,-->
+    <!--                       RECIEVER_CODE,-->
+    <!--                       RECIEVER_NAME,-->
+    <!--                       RECIEVER_TYPE,-->
+    <!--                       SENDER_CODE,-->
+    <!--                       SENDER_NAME,-->
+    <!--                       SENDER_TYPE,-->
+    <!--                       VALID_FLAG,-->
+    <!--                       AUDITING_FLAG-->
+    <!--             ) b-->
+    <!--             on a.STATION_CODE = b.STATION_CODE-->
+    <!--                 and a.STATION_NAME = b.STATION_NAME-->
+    <!--                 and a.MATERIAL_CODE = b.MATERIAL_CODE-->
+    <!--                 and a.MATERIAL_NAME = b.MATERIAL_NAME-->
+    <!--                 and a.RECIEVER_CODE = b.RECIEVER_CODE-->
+    <!--                 and a.RECIEVER_NAME = b.RECIEVER_NAME-->
+    <!--                 and a.RECIEVER_TYPE = b.RECIEVER_TYPE-->
+    <!--                 and a.SENDER_CODE = b.SENDER_CODE-->
+    <!--                 and a.SENDER_NAME = b.SENDER_NAME-->
+    <!--                 and a.SENDER_TYPE = b.SENDER_TYPE-->
+    <!--                 and a.VALID_FLAG = b.VALID_FLAG-->
+    <!--                 and a.AUDITING_FLAG = b.AUDITING_FLAG-->
+    <!--                 LEFT JOIN-->
+    <!--             (SELECT STATION_CODE-->
+    <!--                   , STATION_NAME-->
+    <!--                   , MATERIAL_CODE-->
+    <!--                   , MATERIAL_NAME-->
+    <!--                   , RECIEVER_CODE-->
+    <!--                   , RECIEVER_NAME-->
+    <!--                   , RECIEVER_TYPE-->
+    <!--                   , SENDER_CODE-->
+    <!--                   , SENDER_NAME-->
+    <!--                   , SENDER_TYPE-->
+    <!--                   , VALID_FLAG-->
+    <!--                   , AUDITING_FLAG-->
+    <!--                   , sum(WEIGHT) B16-->
+    <!--              FROM DYNAMIC_WORK_UPDATA-->
+    <!--              WHERE to_char(END_TIME-->
+    <!--                        , 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl16start}-->
+    <!--                AND to_char(END_TIME-->
+    <!--                        , 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl16end}-->
+    <!--&#45;&#45;                 AND VALID_FLAG = '1'-->
+    <!--&#45;&#45;                 AND AUDITING_FLAG = '0'-->
+    <!--                AND STATION_NAME &lt;&gt; 'M1#皮带秤'-->
+    <!--                AND STATION_NAME &lt;&gt; 'M1B#皮带秤'-->
+    <!--              GROUP BY STATION_CODE,-->
+    <!--                       STATION_NAME,-->
+    <!--                       MATERIAL_CODE,-->
+    <!--                       MATERIAL_NAME,-->
+    <!--                       RECIEVER_CODE,-->
+    <!--                       RECIEVER_NAME,-->
+    <!--                       RECIEVER_TYPE,-->
+    <!--                       SENDER_CODE,-->
+    <!--                       SENDER_NAME,-->
+    <!--                       SENDER_TYPE,-->
+    <!--                       VALID_FLAG,-->
+    <!--                       AUDITING_FLAG-->
+    <!--             ) c-->
+    <!--             on a.STATION_CODE = c.STATION_CODE-->
+    <!--                 and a.STATION_NAME = c.STATION_NAME-->
+    <!--                 and a.MATERIAL_CODE = c.MATERIAL_CODE-->
+    <!--                 and a.MATERIAL_NAME = c.MATERIAL_NAME-->
+    <!--                 and a.RECIEVER_CODE = c.RECIEVER_CODE-->
+    <!--                 and a.RECIEVER_NAME = c.RECIEVER_NAME-->
+    <!--                 and a.RECIEVER_TYPE = c.RECIEVER_TYPE-->
+    <!--                 and a.SENDER_CODE = c.SENDER_CODE-->
+    <!--                 and a.SENDER_NAME = c.SENDER_NAME-->
+    <!--                 and a.SENDER_TYPE = c.SENDER_TYPE-->
+    <!--                 and a.VALID_FLAG = c.VALID_FLAG-->
+    <!--                 and a.AUDITING_FLAG = c.AUDITING_FLAG-->
+    <!--                 LEFT JOIN-->
+    <!--             (SELECT STATION_CODE-->
+    <!--                   , STATION_NAME-->
+    <!--                   , MATERIAL_CODE-->
+    <!--                   , MATERIAL_NAME-->
+    <!--                   , RECIEVER_CODE-->
+    <!--                   , RECIEVER_NAME-->
+    <!--                   , RECIEVER_TYPE-->
+    <!--                   , SENDER_CODE-->
+    <!--                   , SENDER_NAME-->
+    <!--                   , SENDER_TYPE-->
+    <!--                   , VALID_FLAG-->
+    <!--                   , AUDITING_FLAG-->
+    <!--                   , sum(WEIGHT) B24-->
+    <!--              FROM DYNAMIC_WORK_UPDATA-->
+    <!--              WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl24start}-->
+    <!--                AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}-->
+    <!--                &#45;&#45;                 AND VALID_FLAG = '1'-->
+    <!--&#45;&#45;                 AND AUDITING_FLAG = '0'-->
+    <!--                AND STATION_NAME &lt;&gt; 'M1#皮带秤'-->
+    <!--                AND STATION_NAME &lt;&gt; 'M1B#皮带秤'-->
+    <!--              GROUP BY STATION_CODE-->
+    <!--                     , STATION_NAME-->
+    <!--                     , MATERIAL_CODE-->
+    <!--                     , MATERIAL_NAME-->
+    <!--                     , RECIEVER_CODE-->
+    <!--                     , RECIEVER_NAME-->
+    <!--                     , RECIEVER_TYPE-->
+    <!--                     , SENDER_CODE-->
+    <!--                     , SENDER_NAME-->
+    <!--                     , SENDER_TYPE-->
+    <!--                     , VALID_FLAG-->
+    <!--                     , AUDITING_FLAG-->
+    <!--             ) d-->
+    <!--             on a.STATION_CODE = d.STATION_CODE-->
+    <!--                 and a.STATION_NAME = d.STATION_NAME-->
+    <!--                 and a.MATERIAL_CODE = d.MATERIAL_CODE-->
+    <!--                 and a.MATERIAL_NAME = d.MATERIAL_NAME-->
+    <!--                 and a.RECIEVER_CODE = d.RECIEVER_CODE-->
+    <!--                 and a.RECIEVER_NAME = d.RECIEVER_NAME-->
+    <!--                 and a.RECIEVER_TYPE = d.RECIEVER_TYPE-->
+    <!--                 and a.SENDER_CODE = d.SENDER_CODE-->
+    <!--                 and a.SENDER_NAME = d.SENDER_NAME-->
+    <!--                 and a.SENDER_TYPE = d.SENDER_TYPE-->
+    <!--                 and a.VALID_FLAG = d.VALID_FLAG-->
+    <!--                 and a.AUDITING_FLAG = d.AUDITING_FLAG-->
+    <!--    </select>-->
     <select id="getAuditData" resultMap="getAuditDataMap">
         select a.STATION_CODE,
                a.STATION_NAME,
@@ -911,13 +1101,13 @@
                           AUDITING_FLAG
              ) a
                  LEFT JOIN
-             (SELECT STATION_NAME,
-                     MATERIAL_NAME,
-                     RECIEVER_NAME,
-                     SENDER_NAME,
-                     sum(WEIGHT) B8,
-                     VALID_FLAG,
-                     AUDITING_FLAG
+             (SELECT STATION_NAME
+                   , MATERIAL_NAME
+                   , RECIEVER_NAME
+                   , SENDER_NAME
+                   , VALID_FLAG
+                   , AUDITING_FLAG
+                   , sum(WEIGHT) B8
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl8end}
@@ -925,16 +1115,10 @@
 --                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
-              GROUP BY STATION_CODE,
-                       STATION_NAME,
-                       MATERIAL_CODE,
+              GROUP BY STATION_NAME,
                        MATERIAL_NAME,
-                       RECIEVER_CODE,
                        RECIEVER_NAME,
-                       RECIEVER_TYPE,
-                       SENDER_CODE,
                        SENDER_NAME,
-                       SENDER_TYPE,
                        VALID_FLAG,
                        AUDITING_FLAG
              ) b
@@ -945,30 +1129,26 @@
                  and a.VALID_FLAG = b.VALID_FLAG
                  and a.AUDITING_FLAG = b.AUDITING_FLAG
                  LEFT JOIN
-             (SELECT STATION_NAME,
-                     MATERIAL_NAME,
-                     RECIEVER_NAME,
-                     SENDER_NAME,
-                     sum(WEIGHT) B16,
-                     VALID_FLAG,
-                     AUDITING_FLAG
+             (SELECT STATION_NAME
+                   , MATERIAL_NAME
+                   , RECIEVER_NAME
+                   , SENDER_NAME
+                   , VALID_FLAG
+                   , AUDITING_FLAG
+                   , sum(WEIGHT) B16
               FROM DYNAMIC_WORK_UPDATA
-              WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl16start}
-                AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl16end}
+              WHERE to_char(END_TIME
+                        , 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl16start}
+                AND to_char(END_TIME
+                        , 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl16end}
 --                 AND VALID_FLAG = '1'
 --                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
-              GROUP BY STATION_CODE,
-                       STATION_NAME,
-                       MATERIAL_CODE,
+              GROUP BY STATION_NAME,
                        MATERIAL_NAME,
-                       RECIEVER_CODE,
                        RECIEVER_NAME,
-                       RECIEVER_TYPE,
-                       SENDER_CODE,
                        SENDER_NAME,
-                       SENDER_TYPE,
                        VALID_FLAG,
                        AUDITING_FLAG
              ) c
@@ -979,30 +1159,24 @@
                  and a.VALID_FLAG = c.VALID_FLAG
                  and a.AUDITING_FLAG = c.AUDITING_FLAG
                  LEFT JOIN
-             (SELECT STATION_NAME,
-                     MATERIAL_NAME,
-                     RECIEVER_NAME,
-                     SENDER_NAME,
-                     sum(WEIGHT) B24,
-                     VALID_FLAG,
-                     AUDITING_FLAG
+             (SELECT STATION_NAME
+                   , MATERIAL_NAME
+                   , RECIEVER_NAME
+                   , SENDER_NAME
+                   , VALID_FLAG
+                   , AUDITING_FLAG
+                   , sum(WEIGHT) B24
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl24start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
---                 AND VALID_FLAG = '1'
+                --                 AND VALID_FLAG = '1'
 --                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
-              GROUP BY STATION_CODE,
-                       STATION_NAME,
-                       MATERIAL_CODE,
+              GROUP BY STATION_NAME,
                        MATERIAL_NAME,
-                       RECIEVER_CODE,
                        RECIEVER_NAME,
-                       RECIEVER_TYPE,
-                       SENDER_CODE,
                        SENDER_NAME,
-                       SENDER_TYPE,
                        VALID_FLAG,
                        AUDITING_FLAG
              ) d
@@ -1011,7 +1185,7 @@
                  and a.RECIEVER_NAME = d.RECIEVER_NAME
                  and a.SENDER_NAME = d.SENDER_NAME
                  and a.VALID_FLAG = d.VALID_FLAG
-                 and a.AUDITING_FLAG = c.AUDITING_FLAG
+                 and a.AUDITING_FLAG = d.AUDITING_FLAG
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into DYNAMIC_WORK_UPDATA
@@ -1243,7 +1417,7 @@
         and AUDITING_FLAG = '0'
     </select>
     <!--    作废返粉的原始数据-->
-    <select id="disableForReturnedDust" parameterType="map">
+    <update id="disableForReturnedDust" parameterType="map">
         update DYNAMIC_WORK_UPDATA
         set VALID_FLAG = '0'
         where
@@ -1259,7 +1433,7 @@
         and END_TIME between #{startTime} and #{endTime}
         and VALID_FLAG = '1'
         and AUDITING_FLAG = '0'
-    </select>
+    </update>
     <update id="setAudit">
         UPDATE DYNAMIC_WORK_UPDATA t
         SET t.AUDITING_FLAG = '1'
@@ -1275,6 +1449,7 @@
           AND t.SENDER_TYPE = #{senderType}
           AND t.END_TIME &gt;= #{startTime}
           AND t.END_TIME &lt;= #{endTime}
+          and t.AUDITING_FLAG = '0'
     </update>
     <update id="setUnAudit">
         UPDATE DYNAMIC_WORK_UPDATA t
@@ -1291,5 +1466,24 @@
           AND t.SENDER_TYPE = #{senderType}
           AND t.END_TIME &gt;= #{startTime}
           AND t.END_TIME &lt;= #{endTime}
+          and t.AUDITING_FLAG = '1'
     </update>
+    <!--    查询审核或者取消审核的记录条数-->
+    <select id="getCountForAuditOrUnaudit" resultType="int" parameterType="map">
+        select count(1) as count
+        from DYNAMIC_WORK_UPDATA t
+        WHERE t.STATION_NAME = #{stationName}
+          AND t.STATION_CODE = #{stationCode}
+          AND t.MATERIAL_CODE = #{materialCode}
+          AND t.MATERIAL_NAME = #{materialName}
+          AND t.RECIEVER_NAME = #{recieverName}
+          AND t.RECIEVER_CODE = #{recieverCode}
+          AND t.SENDER_NAME = #{senderName}
+          AND t.SENDER_CODE = #{senderCode}
+          AND t.RECIEVER_TYPE = #{recieverType}
+          AND t.SENDER_TYPE = #{senderType}
+          AND t.END_TIME &gt;= #{startTime}
+          AND t.END_TIME &lt;= #{endTime}
+          and t.AUDITING_FLAG = #{auditingFlag}
+    </select>
 </mapper>