优化

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmGongdanDetailController.java

@@ -46,31 +46,6 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 	@Autowired
 	private IItdmTestPlanService itdmTestPlanService;
 
-	/**
-	 * 分页列表查询
-	 *
-	 * @param itdmGongdanDetail
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "工单detail-分页列表查询")
-	@ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
-	@GetMapping(value = "/list1")
-	public Result<Page<ItdmGongdanDetailListVO>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
-															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-															   HttpServletRequest req) {
-		Result<Page<ItdmGongdanDetailListVO>> result = new Result<Page<ItdmGongdanDetailListVO>>();
-		Page<ItdmGongdanDetailListVO> pageList = new Page<>(pageNo,pageSize);
-		pageList = itdmGongdanDetailService.getDetailList(pageList,itdmGongdanDetail.getWoId());//通知公告消息
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-
-
 	@ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<Page<ItdmGongdanDetailListVO>> queryPageList1(ItdmGongdanDetail itdmGongdanDetail,
@@ -102,6 +77,26 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 //		return Result.OK(pageList);
 //	}
 
+
+//	/**
+//	 * 分页列表查询——自定义sql查询
+//	 */
+//	//@AutoLog(value = "工单detail-分页列表查询")
+//	@ApiOperation(value="分页列表查询——自定义sql查询", notes="分页列表查询——自定义sql查询")
+//	@GetMapping(value = "/list")
+//	public Result<Page<ItdmGongdanDetailListVO>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
+//															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//															   HttpServletRequest req) {
+//		Result<Page<ItdmGongdanDetailListVO>> result = new Result<Page<ItdmGongdanDetailListVO>>();
+//		Page<ItdmGongdanDetailListVO> pageList = new Page<>(pageNo,pageSize);
+//		pageList = itdmGongdanDetailService.getDetailList(pageList,itdmGongdanDetail.getWoId());//通知公告消息
+//		result.setSuccess(true);
+//		result.setResult(pageList);
+//		return result;
+//	}
+
+
 	/**
 	 *   添加
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmJCXMSHJHController.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.itdmGongDan.controller;
 
+import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.itdmGongDan.dto.ItdmXMJLQueryListDTO;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
@@ -60,6 +62,7 @@ public class ItdmJCXMSHJHController {
     @PostMapping(value = "/XMJLAddOrUpdate")
     public Result<String> XMJLAddOrUpdate(@RequestBody ItdmXMJLQueryListVO vo) {
         System.out.println("项目经理新增工单master");
+        System.out.println(JSON.toJSON(vo));
         return Result.OK(iItdmJCXMSHJHService.XMJLAddOrUpdate(vo));
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/convert/GongDanDetailConvert.java

@@ -39,5 +39,6 @@ public interface GongDanDetailConvert {
     @Mapping(target ="testItemsId",source ="master.testItemsId")
     @Mapping(target ="weituoYangpinId",source ="master.weituoYangpinId")
     @Mapping(target ="shebeiId",source ="master.shebeiId")
+    @Mapping(target ="createTime",source ="detail.createTime")
     ItdmGongdanDetailListVO toList(ItdmGongdanDetail detail, ItdmGongdanMaster master, ItdmTestPlan itdmTestPlan);
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmGongdanDetailListVO.java

@@ -30,6 +30,11 @@ public class ItdmGongdanDetailListVO implements Serializable {
     @Excel(name = "工单id", width = 15)
     @ApiModelProperty(value = "工单id")
     private java.lang.String woId;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
     /**实绩设备id*/
     @Excel(name = "实绩设备id", width = 15)
     @ApiModelProperty(value = "实绩设备id")