富平手机端app问题修复

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

@@ -6,6 +6,7 @@ import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -24,7 +25,7 @@ import javax.validation.constraints.NotBlank;
  * @author ztw
  * @since 2021-04-28
  */
-@Api(tags = "生产工序-装车工序")
+@Api(tags = "生产工序-铲装工序")
 @RestController
 @RequestMapping("/business/t-processes-digging")
 @Validated
@@ -33,36 +34,36 @@ public class TProcessesDiggingController {
 	@Autowired
 	private ITProcessesDiggingService processesDiggingService;
 
-	@ApiOperation(value = "装车工序-今日数量统计", notes = "digDate 如果不传默认查询当天数据")
+	@ApiOperation(value = "铲装工序-今日数量统计", notes = "digDate 如果不传默认查询当天数据")
 	@GetMapping("/getTodayData")
 	public R getTodayData(String digDate) {
 		return processesDiggingService.getTodayData(digDate);
 	}
 
 
-	@ApiOperation(value = "装车工序分页")
+	@ApiOperation(value = "铲装工序分页")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "digDate", value = "装车时间", paramType = "query", dataType = "String")
+			@ApiImplicitParam(name = "digDate", value = "铲装时间", paramType = "query", dataType = "String")
 	})
 	@GetMapping("/getPage")
-	public R getPage(PageQuery pageQuery, String digDate) {
-		return processesDiggingService.getPage(pageQuery, digDate);
+	public R getPage(Query query, String digDate) {
+		return processesDiggingService.getPage(query, digDate);
 	}
 
 
-	@ApiOperation(value = "保存装车工序")
+	@ApiOperation(value = "保存铲装工序")
 	@PostMapping("/save")
 	public R save(@RequestBody TProcessesDiggingQuery query) {
 		return processesDiggingService.save(query);
 	}
 
-	@ApiOperation(value = "修改装车工序")
+	@ApiOperation(value = "修改铲装工序")
 	@PostMapping("/update")
 	public R update(@RequestBody TProcessesDiggingQuery query) {
 		return processesDiggingService.update(query);
 	}
 
-	@ApiOperation(value = "装车工序详情")
+	@ApiOperation(value = "铲装工序详情")
 	@GetMapping("/getDetail/{Uid}")
 	public R getDetail(@PathVariable @NotBlank String Uid) {
 		return processesDiggingService.getDetail(Uid);

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDigging.java

@@ -87,6 +87,12 @@ public class TProcessesDigging implements Serializable {
     @TableField("EquipmentID")
     private String EquipmentID;
 
+    /**
+     * 设备名称
+     */
+    @TableField(exist = false)
+    private String EquipmentName;
+
     /**
      * 司机
      */

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

@@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TMaterialOutMapper extends BaseMapper<TMaterialOut> {
 
+
+
 }

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

 package cn.wise.sc.acquisition.business.mapper;
 
 import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo;
 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>
@@ -13,4 +18,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TProcessesDiggingMapper extends BaseMapper<TProcessesDigging> {
 
+
+	Page<TProcessesDigging> getPage(Page<TProcessesDigging> page, @Param("params") Map<String, Object> params);
+
+	TProcessesDigging getDetail(String Uid);
+
 }

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

@@ -2,4 +2,5 @@
 <!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.TMaterialOutMapper">
 
+
 </mapper>

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

@@ -48,9 +48,11 @@
         a.WorkTime,
         a.Price,
         a.TotalMoney,
-        b.Wcdw
+        b.Wcdw,
+        tea.EquipmentName as EquipmentName
         FROM T_Processes_Crusher a
         <include refid="TProcessesCrusherJoins"/>
+        LEFT JOIN T_Equipment_Account tea on tea.EquipmentID = a.EquipmentID
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -2,4 +2,30 @@
 <!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.TProcessesDiggingMapper">
 
+
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.entity.TProcessesDigging">
+        SELECT
+        a.*,
+        tea.EquipmentName as EquipmentName
+        FROM T_Processes_Digging a
+        LEFT JOIN T_Equipment_Account tea on tea.EquipmentID = a.EquipmentID
+        where 1=1
+        <if test="params.digDate != null and params.digDate != ''">
+            and Convert(varchar(10),a.DigDate,120) <![CDATA[ = ]]> #{params.digDate}
+        </if>
+        order by a.DigDate desc
+    </select>
+
+
+    <select id="getDetail" resultType="cn.wise.sc.acquisition.business.entity.TProcessesDigging">
+        SELECT
+        a.*,
+        tea.EquipmentName as EquipmentName
+        FROM T_Processes_Digging a
+        LEFT JOIN T_Equipment_Account tea on tea.EquipmentID = a.EquipmentID
+        where a.Uid = #{Uid}
+    </select>
+
+
+
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesCrusherVo.java

 package cn.wise.sc.acquisition.business.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -67,6 +68,12 @@ public class TProcessesCrusherVo  extends TWeightVo{
     @ApiModelProperty("EquipmentID")
     private String EquipmentID;
 
+    /**
+     * 设备名称
+     */
+    @TableField(exist = false)
+    private String EquipmentName;
+
     /**
      * 工作内容
      */

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

@@ -4,7 +4,9 @@ import cn.wise.im.common.http.R;
 import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -19,7 +21,7 @@ public interface ITProcessesDiggingService extends IService<TProcessesDigging> {
 
 	R getTodayData(String digDate);
 
-	R<IPage<TProcessesDigging>> getPage(PageQuery pageQuery, String digDate);
+	R<Page<TProcessesDigging>> getPage(Query query, String digDate);
 
 	R save(TProcessesDiggingQuery query);
 

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

@@ -7,8 +7,10 @@ import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
 import cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo;
 import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -85,13 +87,13 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
     /**
      * 分页列表
      *
-     * @param pageQuery
+     * @param query
      * @param digDate
      * @return
      */
     @Override
-    public R<IPage<TProcessesDigging>> getPage(PageQuery pageQuery, String digDate) {
-        QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
+    public R<Page<TProcessesDigging>> getPage(Query query, String digDate) {
+       /* QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
         if (StringUtils.isNoneBlank(digDate)) {
             try {
                 SimpleDateFormat formatter = new SimpleDateFormat(
@@ -103,10 +105,16 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
                 e.printStackTrace();
             }
         }
-        qw.orderByDesc("DigDate");
-        IPage<TProcessesDigging> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        page = processesDiggingMapper.selectPage(page, qw);
-        return R.ok(page);
+        qw.orderByDesc("DigDate");*/
+        Page<TProcessesDigging> page = new Page<>(query.getPageNum(), query.getPageSize());
+        Map<String, Object> params = new HashMap<>();
+        params.put("digDate", digDate);
+
+        Page<TProcessesDigging> data = processesDiggingMapper.getPage(page, params);
+
+
+
+        return R.ok(data);
     }
 
     /**
@@ -166,7 +174,7 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
     @Override
     public R<TProcessesDigging> getDetail(String Uid) {
         Rcode.NOT_PARAM.assertNotNull(Uid);
-        TProcessesDigging digging = processesDiggingMapper.selectById(Uid);
+        TProcessesDigging digging = processesDiggingMapper.getDetail(Uid);
         Rcode.NOT_FOUND.assertNotNull(digging);
         return R.ok(digging);
     }