爆破列表 炮孔编号 设计孔深 单孔爆破量数据展示

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/xml/TProcessesBlastMapper.xml

@@ -14,10 +14,17 @@
         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}