Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialOutController.java

@@ -69,12 +69,7 @@ public class TMaterialOutController {
     })
     @GetMapping("/getConsumePage")
     public R getConsumePage(PageQuery pageQuery, String processesName, String consumeDate) {
-        TMaterialOutQuery tMaterialOutQuery = new TMaterialOutQuery();
-        tMaterialOutQuery.setProcessesName(processesName);
-        if (StringUtils.isNotBlank(consumeDate)) {
-            tMaterialOutQuery.setConsumeDate(DateUtil.strToTime(consumeDate));
-        }
-        return materialOutService.getConsumePage(tMaterialOutQuery, pageQuery);
+        return materialOutService.getConsumePage(consumeDate, pageQuery);
     }
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastController.java

@@ -43,11 +43,11 @@ public class TProcessesBlastController {
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
     public R getPage(Query query, String blastDate) {
-        TProcessesBlastQuery param = new TProcessesBlastQuery();
+        /*TProcessesBlastQuery param = new TProcessesBlastQuery();
         if (StringUtils.isNotBlank(blastDate)) {
             param.setBlastDate(DateUtil.strToTime(blastDate));
-        }
-        return itProcessesBlastService.getPage(param, query);
+        }*/
+        return itProcessesBlastService.getPage(blastDate, query);
     }
 
     /**

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserController.java

 package cn.wise.sc.acquisition.business.controller;
 
 
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.service.ITSysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -13,10 +22,25 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ztw
  * @since 2021-04-23
  */
+@Api(tags = "系统管理-用户管理")
 @RestController
 @RequestMapping("/business/t-sys-user")
 public class TSysUserController {
 
+	@Autowired
+	private ITSysUserService userService;
+
+
+
+	@ApiOperation(value = "用户列表")
+	@GetMapping("/getList")
+	public R getList() {
+		return R.ok(userService.list());
+	}
+
+
+
+
 
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /**
  * <p>
  * Mapper 接口
@@ -17,6 +19,8 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface TProcessesBlastMapper extends BaseMapper<TProcessesBlast> {
 
+    Page<TProcessesBlastVo> getNewPage(Page<TProcessesBlastVo> page, @Param("params") Map<String, Object> params);
+
     Page<TProcessesBlastVo> getPage(Page<TProcessesBlast> page, @Param("ew") QueryWrapper<TProcessesBlast> queryWrapper);
 
     TProcessesBlastVo getByQuery(@Param("ew") QueryWrapper<TProcessesBlast> queryWrapper);

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,4 +28,9 @@ public interface TProcessesDrillingMapper extends BaseMapper<TProcessesDrilling>
     Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
 
     int updateByDrillingDate(@Param("params") Map<String, Object> params);
+
+    List<String> getUidList(@Param("blastDate") String blastDate);
+
+
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastMapper.xml

@@ -2,12 +2,40 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper">
 
+    <select id="getNewPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
+        select
+        a.Uid,
+        a.BlastPeople,
+        a.CheckHoleDate,
+        a.CheckHolePeople,
+        a.Manager,
+        a.Supervisor,
+        a.TechDepart,
+        a.Tabulator,
+        a.Bz,
+        a.Tag,
+        b.StopeName,
+        b.StepName,
+        b.BlastAreaName,
+        b.BlastHoleID AS HoleID,
+        b.HoleBlastVolume,
+        b.depth AS DesignDepth,
+        c.BlastDate,
+        c.Depth
+        from T_Processes_Blast a
+        left join T_Processes_Drilling c on c.Uid = a.Uid
+        left join T_Processes_BlastDesign_Hole b on b.Uid = c.Uid
+        where 1=1
+        <if test="params.blastDate != null and params.blastDate != ''">
+            and Convert(varchar(10),c.BlastDate,120) <![CDATA[ = ]]> #{params.blastDate}
+        </if>
+    </select>
+
+
 
     <!-- 表和实体字段对照关系, 类似RestultMap -->
     <sql id="TProcessesBlastColumns">
         a.Uid,
-
-
         a.BlastPeople,
         a.CheckHoleDate,
         a.CheckHolePeople,

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml

@@ -77,6 +77,23 @@
 
     </update>
 
+
+    <select id="getUidList" resultType="java.lang.String">
+        select tpd.Uid from T_Processes_Drilling tpd where tpd.BlastDate=#{blastDate}
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialOutService.java

@@ -27,6 +27,6 @@ public interface ITMaterialOutService extends IService<TMaterialOut> {
 
 	R<TMaterialOut> getDetail(String Uid);
 
-	R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery,PageQuery pageQuery);
+	R<IPage<TMaterialOut>> getConsumePage(String consumeDate, PageQuery pageQuery);
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITProcessesBlastService extends IService<TProcessesBlast> {
 
-    R getPage(TProcessesBlastQuery tProcessesBlastQuery, Query query);
+    R getPage(String blastDate,  Query query);
 
     R updateByUid(TProcessesBlastQuery query);
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java

@@ -5,6 +5,7 @@ import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TMaterialOut;
 import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
+import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
@@ -28,6 +29,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,6 +59,7 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
 
 
+
     /**
      * 分页列表
      *
@@ -173,30 +177,30 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
     /**
      * 物资消耗列表查询 分页列表
      *
-     * @param tMaterialOutQuery
+     * @param consumeDate
      * @return
      */
     @Override
-    public R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery, PageQuery query) {
-        log.info(JSON.toJSONString(tMaterialOutQuery));
-        //参数校验
-        //分页
-        Page<TMaterialOut> page = new Page<>(query.getPageNo(), query.getPageSize());
+    public R<IPage<TMaterialOut>> getConsumePage(String consumeDate, PageQuery query) {
+
         //条件封装
         QueryWrapper<TMaterialOut> queryWrapper = new QueryWrapper<>();
-        //如果设计时间不为空  条件查询
-        if (tMaterialOutQuery.getConsumeDate() != null) {
-            //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
-            queryWrapper
-                    .ge(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getBeginTimeStr(tMaterialOutQuery.getConsumeDate()))
-                    .le(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getEndTimeStr(tMaterialOutQuery.getConsumeDate()));
+        if (StringUtils.isNoneBlank(consumeDate)) {
+            try {
+                SimpleDateFormat formatter = new SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss");
+                String startDate = consumeDate + " 00:00:00";
+                String endDate = consumeDate + " 23:59:59";
+                queryWrapper.between("ConsumeDate",formatter.parse(startDate), formatter.parse(endDate));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
-        queryWrapper.eq(StringUtils.isNotBlank(tMaterialOutQuery.getProcessesName()),
-                ProjectEnum.TMaterialOut.PROCESSES_NAME.getLabel(),
-                tMaterialOutQuery.getProcessesName());
-        //查询
-        Page<TMaterialOut> tMaterialOutPage = baseMapper.selectPage(page, queryWrapper);
-        return R.ok(tMaterialOutPage);
+        queryWrapper.orderByDesc("ConsumeDate");
+
+        IPage<TMaterialOut> page = new Page<>(query.getPageNo(), query.getPageSize());
+        page = materialOutMapper.selectPage(page, queryWrapper);
+        return R.ok(page);
     }
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java

@@ -2,10 +2,12 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper;
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastQuery;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
 import cn.wise.sc.acquisition.business.service.*;
 import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
 import cn.wise.sc.acquisition.business.util.DateUtil;
@@ -21,6 +23,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 服务实现类  爆破工序
@@ -45,9 +51,19 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
     @Autowired
     private ITSysDictService itSysDictService;
 
+    @Resource
+    private TProcessesBlastMapper processesBlastMapper;
+
     @Override
-    public R getPage(TProcessesBlastQuery tProcessesBlastQuery, Query query) {
-        log.info(JSON.toJSONString(tProcessesBlastQuery));
+    public R getPage(String blastDate, Query query) {
+
+        Page<TProcessesBlastVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+        Map<String, Object> params = new HashMap<>();
+        params.put("blastDate", blastDate);
+
+        Page<TProcessesBlastVo> data = processesBlastMapper.getNewPage(page, params);
+
+       /* log.info(JSON.toJSONString(tProcessesBlastQuery));
         //参数校验
         //分页
         Page<TProcessesBlast> page = new Page<>(query.getPageNum(), query.getPageSize());
@@ -64,7 +80,7 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
                     .le(stringBuilder.toString(), DateUtil.getEndTimeStr(tProcessesBlastQuery.getBlastDate()));
         }
         //查询分页数据
-        Page<TProcessesBlastVo> data = baseMapper.getPage(page, queryWrapper);
+        Page<TProcessesBlastVo> data = baseMapper.getPage(page, queryWrapper);*/
         return R.ok(data);
     }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java

 package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
 import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
 import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
@@ -20,14 +21,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
+import java.util.*;
 
 /**
  * <p>
@@ -315,6 +315,33 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         tProcessesDrilling.setBlastDate(query.getBlastDate());
         params.put("BlastDate",query.getBlastDate());
         int update = baseMapper.updateByDrillingDate(params);
+
+        //向穿孔表中插入数据
+
+        QueryWrapper<TProcessesDrilling> tpdWrapper = new QueryWrapper<>();
+        tpdWrapper.eq("BlastDate",query.getBlastDate());
+        List<TProcessesDrilling> drillintList =  baseMapper.selectList(tpdWrapper);
+
+        //设置tag
+        R<String> r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        List<TProcessesBlast> tpbList = new ArrayList<>();
+        if(drillintList != null && drillintList.size()>0){
+            for(TProcessesDrilling drillint : drillintList){
+                TProcessesBlast blast = itProcessesBlastService.getById(drillint.getUid());
+                if(blast != null ){
+                    blast.setTag(r1.getData());
+                }else{
+                    blast = new TProcessesBlast();
+                    blast.setTag(r1.getData());
+                    blast.setUid(drillint.getUid());
+                }
+                tpbList.add(blast);
+            }
+            itProcessesBlastService.saveOrUpdateBatch(tpbList);
+        }
         if (update > 0) {
             return R.ok("穿孔工序中->修改爆破日期成功");
         } else {

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.xml

@@ -2,12 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper">
 
+    <select id="getNewPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
+        select
+        a.Uid,
+        a.BlastPeople,
+        a.CheckHoleDate,
+        a.CheckHolePeople,
+        a.Manager,
+        a.Supervisor,
+        a.TechDepart,
+        a.Tabulator,
+        a.Bz,
+        a.Tag,
+        c.BlastDate,
+        c.Depth
+        from T_Processes_Blast a
+        left join T_Processes_Drilling c on c.Uid = a.Uid
+        where 1=1
+        <if test="params.blastDate != null and params.blastDate != ''">
+            and Convert(varchar(10),c.BlastDate,120) <![CDATA[ = ]]> #{params.blastDate}
+        </if>
+    </select>
+
+
 
     <!-- 表和实体字段对照关系, 类似RestultMap -->
     <sql id="TProcessesBlastColumns">
         a.Uid,
-
-
         a.BlastPeople,
         a.CheckHoleDate,
         a.CheckHolePeople,

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.xml

@@ -77,6 +77,23 @@
 
     </update>
 
+
+    <select id="getUidList" resultType="java.lang.String">
+        select tpd.Uid from T_Processes_Drilling tpd where tpd.BlastDate=#{blastDate}
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT