Przeglądaj źródła

AGC等监视页面修改

shilin 3 lat temu
rodzic
commit
698e50100e
64 zmienionych plików z 23915 dodań i 545 usunięć
  1. 12 9
      src/main/java/com/gyee/frame/common/spring/Constant.java
  2. 52 0
      src/main/java/com/gyee/frame/controller/monitor/GenreSetPushController.java
  3. 22 4
      src/main/java/com/gyee/frame/controller/monitor/MatrixPushController.java
  4. 141 0
      src/main/java/com/gyee/frame/controller/monitor/MonitorPushController.java
  5. 98 0
      src/main/java/com/gyee/frame/controller/monitor/MonitorWtPushController.java
  6. 67 0
      src/main/java/com/gyee/frame/controller/report/WtHealthReport3Controller.java
  7. 97 0
      src/main/java/com/gyee/frame/mapper/auto/WtReportFault3Mapper.java
  8. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreport3Mapper.java
  9. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreportchart3Mapper.java
  10. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreportfnlyl3Mapper.java
  11. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreportkkxfx3Mapper.java
  12. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreportmain3Mapper.java
  13. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreportpart3Mapper.java
  14. 97 0
      src/main/java/com/gyee/frame/mapper/auto/Wttragetreportxndjpj3Mapper.java
  15. 872 0
      src/main/java/com/gyee/frame/model/auto/WtReportFault3.java
  16. 2013 0
      src/main/java/com/gyee/frame/model/auto/WtReportFault3Example.java
  17. 179 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreport3.java
  18. 603 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreport3Example.java
  19. 312 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportchart3.java
  20. 894 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportchart3Example.java
  21. 443 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportfnlyl3.java
  22. 1133 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportfnlyl3Example.java
  23. 443 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportkkxfx3.java
  24. 1133 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportkkxfx3Example.java
  25. 1631 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportmain3.java
  26. 3354 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportmain3Example.java
  27. 344 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportpart3.java
  28. 973 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportpart3Example.java
  29. 311 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportxndjpj3.java
  30. 903 0
      src/main/java/com/gyee/frame/model/auto/Wttragetreportxndjpj3Example.java
  31. 9 0
      src/main/java/com/gyee/frame/model/custom/MatrixVo.java
  32. 61 3
      src/main/java/com/gyee/frame/service/ShutdowneventService.java
  33. 2 0
      src/main/java/com/gyee/frame/service/WindTurbineTestingPointDiService.java
  34. 310 0
      src/main/java/com/gyee/frame/service/report/WtHealthReport3Service.java
  35. 124 0
      src/main/java/com/gyee/frame/service/report/WtReportFault3Service.java
  36. 124 0
      src/main/java/com/gyee/frame/service/report/Wttragetreport3Service.java
  37. 125 0
      src/main/java/com/gyee/frame/service/report/Wttragetreportchart3Service.java
  38. 125 0
      src/main/java/com/gyee/frame/service/report/Wttragetreportfnlyl3Service.java
  39. 121 0
      src/main/java/com/gyee/frame/service/report/Wttragetreportkkxfx3Service.java
  40. 122 0
      src/main/java/com/gyee/frame/service/report/Wttragetreportmain3Service.java
  41. 124 0
      src/main/java/com/gyee/frame/service/report/Wttragetreportpart3Service.java
  42. 123 0
      src/main/java/com/gyee/frame/service/report/Wttragetreportxndjpj3Service.java
  43. 121 59
      src/main/java/com/gyee/frame/service/websocket/AgcService.java
  44. 28 1
      src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java
  45. 626 16
      src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java
  46. 1 1
      src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java
  47. 829 7
      src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java
  48. 452 368
      src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java
  49. 5 59
      src/main/java/com/gyee/frame/service/websocket/WtWarnPushService.java
  50. 10 1
      src/main/resources/mybatis-generator.xml
  51. 602 0
      src/main/resources/mybatis/auto/WtReportFault3Mapper.xml
  52. 271 0
      src/main/resources/mybatis/auto/Wttragetreport3Mapper.xml
  53. 335 0
      src/main/resources/mybatis/auto/Wttragetreportchart3Mapper.xml
  54. 397 0
      src/main/resources/mybatis/auto/Wttragetreportfnlyl3Mapper.xml
  55. 397 0
      src/main/resources/mybatis/auto/Wttragetreportkkxfx3Mapper.xml
  56. 965 0
      src/main/resources/mybatis/auto/Wttragetreportmain3Mapper.xml
  57. 350 0
      src/main/resources/mybatis/auto/Wttragetreportpart3Mapper.xml
  58. 335 0
      src/main/resources/mybatis/auto/Wttragetreportxndjpj3Mapper.xml
  59. 1 1
      src/test/java/test/MatrixByWpPushTest.java
  60. 79 0
      src/test/java/test/ShutdowneventServiceTest.java
  61. 10 3
      src/test/java/test/WpInfoPushTest.java
  62. 16 10
      src/test/java/test/WtHealthReportTest.java
  63. 2 1
      src/test/java/test/WtInfoPushServiceTest.java
  64. 4 2
      src/test/java/test/WtWarnPushServiceTest.java

+ 12 - 9
src/main/java/com/gyee/frame/common/spring/Constant.java

@@ -143,10 +143,8 @@ public class Constant {
 	public static final String TPOINT_WT_BJJD3 = "AI078";// 变桨角度3
 	public static final String TPOINT_WT_PJFS = "RPJFS"; // 日平均风速
 	public static final String TPOINT_WT_PJGL = "RPJGL";// 风机平均功率
-	public static final String TPOINT_WT_JCWWD = "AI056";// 机舱外温度
-	public static final String TPOINT_WT_JCWD = "AI057";// 机舱温度
-	public static final String TPOINT_WT_TDGWD = "AI069";// 塔底柜温度
-	public static final String TPOINT_WT_JCGWD = "AI070";// 机舱柜温度
+
+
 	public static final String TPOINT_WT_FJFX = "AI008";// 风机风向
 	public static final String TPOINT_WT_FJPL = "AI068";// 风机频率
 	public static final String TPOINT_WT_WGGL = "AI131";// 无功功率
@@ -371,9 +369,10 @@ public class Constant {
 	public static final String FJYZSL = "JKSLYZ001";// 风机严重健康状态数量
 
 
-
-
-
+	public static final String PCS_WD = "AI287";//Pcs温度
+	public static final String TPOINT_WT_U2YZWD = "AI046";//U2绕组温度
+	public static final String TPOINT_WT_V2YZWD = "AI048";//V2绕组温度
+	public static final String TPOINT_WT_W2YZWD = "AI050";//W2绕组温度
 
 /********************************************变桨*********************************************************************/
 
@@ -445,7 +444,7 @@ public class Constant {
 	public static final String TPOINT_WT_FDJZCAWD = "AI052";// 发电机轴承A温度
 	public static final String TPOINT_WT_FDJZCBWD = "AI053";// 发电机轴承B温度
 	public static final String TPOINT_WT_FDJLQFWD = "AI054";//发电机冷却风温度
-
+	public static final String TPOINT_WT_FDJHHWD = "AI055";//发电机滑环温度
 
 	public static final String TPOINT_WT_FDJJRQBHZC = "DI254";//发电机加热器保护正常
 	public static final String TPOINT_WT_QDFDJJRQ  = "DI827";//启动发电机加热器
@@ -496,6 +495,7 @@ public class Constant {
 
 	public static final String TPOINT_WT_YYXTYY = "AI018";// 液压系统油压
 	public static final String TPOINT_WT_ZZSCXTYY = "AI019";// 转子刹车系统液压
+	public static final String TPOINT_WT_YYYW = "AI020";//液压油温
 	public static final String TPOINT_WT_FDJLQSWD = "AI300";// 液压系统油压
 
 
@@ -524,7 +524,10 @@ public class Constant {
 
 	public static final String TPOINT_WT_YLZS = "AI012";// 叶轮转速
 
-
+	public static final String TPOINT_WT_JCWWD = "AI056";// 机舱外温度
+	public static final String TPOINT_WT_JCWD = "AI057";// 机舱温度
+	public static final String TPOINT_WT_TDGWD = "AI069";// 塔底柜温度
+	public static final String TPOINT_WT_JCGWD = "AI070";// 机舱柜温度
 
 	public static final String TPOINT_WT_YYYYW2 = "DI129";//液压油液位ok
 	public static final String TPOINT_WT_YYYWDCX2  = "DI863";//液压油温度超限

+ 52 - 0
src/main/java/com/gyee/frame/controller/monitor/GenreSetPushController.java

@@ -0,0 +1,52 @@
+package com.gyee.frame.controller.monitor;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.service.websocket.AgcService;
+import com.gyee.frame.service.websocket.GenreSetPushService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/genreset")
+@Api(value = "驾驶舱" ,tags =  "驾驶舱")
+public class GenreSetPushController {
+
+    @Resource
+    private GenreSetPushService genreSetPushService;
+    @Resource
+    private AgcService agcService;
+
+
+    @PostMapping("/getAgcValues")
+    @ResponseBody
+    @ApiOperation(value = "获取AGC信息", notes = "获取AGC信息")
+    @ApiImplicitParams({})
+    public AjaxResult getAgcValues() throws Exception {
+
+
+        List<Map<String, Object>> vos=  new ArrayList<>();
+
+
+        vos=agcService.getAgcValues();
+
+        if (null!=vos){
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+
+
+}

+ 22 - 4
src/main/java/com/gyee/frame/controller/monitor/MatrixPushController.java

@@ -2,11 +2,9 @@ package com.gyee.frame.controller.monitor;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.service.websocket.MatrixDetialGfPushService;
-import com.gyee.frame.service.websocket.MatrixDetialPushService;
-import com.gyee.frame.service.websocket.MatrixPushService;
-import com.gyee.frame.service.websocket.MatrixQfPushService;
+import com.gyee.frame.service.websocket.*;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
@@ -31,6 +29,8 @@ public class MatrixPushController {
     private MatrixDetialGfPushService matrixDetialGfPushService;
     @Resource
     private MatrixQfPushService matrixQfPushService;
+    @Resource
+    private MatrixPushByWpService matrixPushByWpService;
 
     @PostMapping("/matrixPush")
     @ResponseBody
@@ -113,6 +113,24 @@ public class MatrixPushController {
     }
 
 
+    @PostMapping("/matrixByWpIdPush")
+    @ResponseBody
+    @ApiOperation(value = "风场矩阵", notes = "风场矩阵")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult matrixByWpIdPush(String wpId) throws Exception {
+
+
+        Map<String, Object> map=  new HashMap<>();
+
+
+        map=matrixPushByWpService.findMatrixById(wpId);
 
+        if (null!=map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
 
 }

+ 141 - 0
src/main/java/com/gyee/frame/controller/monitor/MonitorPushController.java

@@ -0,0 +1,141 @@
+package com.gyee.frame.controller.monitor;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.custom.DataVo;
+import com.gyee.frame.service.websocket.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/monitor")
+@Api(value = "状态监视" ,tags =  "状态监视")
+public class MonitorPushController {
+
+    @Resource
+    private WpInfoPushService wpInfoPushService;
+    @Resource
+    private MatrixDetialPushService matrixDetialPushService;
+    @Resource
+    private MatrixDetialGfPushService matrixDetialGfPushService;
+    @Resource
+    private MatrixQfPushService matrixQfPushService;
+    @Resource
+    private MatrixPushByWpService matrixPushByWpService;
+
+    @PostMapping("/monitor")
+    @ResponseBody
+    @ApiOperation(value = "状态监视", notes = "状态监视")
+    @ApiImplicitParams({})
+    public AjaxResult monitor() throws Exception {
+
+
+        Map<String, Object> map=  new HashMap<>();
+
+
+        map=wpInfoPushService.findWpInfo();
+
+        if (null!=map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+    @PostMapping("/findWpInfoBywpId")
+    @ResponseBody
+    @ApiOperation(value = "场站监视", notes = "场站监视")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWpInfoBywpId(String wpId) throws Exception {
+
+
+        Map<String, Object> map=  new HashMap<>();
+
+
+        map=wpInfoPushService.findWpInfoBy(wpId);
+
+        if (null!=map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+    @PostMapping("/findLossWpBar")
+    @ResponseBody
+    @ApiOperation(value = "场站监视损失电量图表", notes = "场站监视损失电量图表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findLossWpBar(String wpId) throws Exception {
+
+
+        List<DataVo> vos=  new ArrayList<>();
+
+
+        vos=wpInfoPushService.findLossWpBar(wpId);
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+
+    @PostMapping("/findPowerWpBar")
+    @ResponseBody
+    @ApiOperation(value = "场站监视日发电量图表", notes = "场站监视日发电量图表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findPowerWpBar(String wpId) throws Exception {
+
+
+        List<DataVo> vos=  new ArrayList<>();
+
+
+        vos=wpInfoPushService.findPowerWpBar(wpId);
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+
+    @PostMapping("/findMonthPowerWpBar")
+    @ResponseBody
+    @ApiOperation(value = "场站监视月发电量图表", notes = "场站监视月发电量图表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findMonthPowerWpBar(String wpId) throws Exception {
+
+
+        List<DataVo> vos=  new ArrayList<>();
+
+
+        vos=wpInfoPushService.findMonthPowerWpBar(wpId);
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+}

+ 98 - 0
src/main/java/com/gyee/frame/controller/monitor/MonitorWtPushController.java

@@ -0,0 +1,98 @@
+package com.gyee.frame.controller.monitor;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.service.websocket.WtInfoPushService;
+import com.gyee.frame.service.websocket.WtWarnPushService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/monitorwt")
+@Api(value = "风机监视" ,tags =  "风机监视")
+public class MonitorWtPushController {
+
+    @Resource
+    private WtInfoPushService wtInfoPushService;
+    @Resource
+    private WtWarnPushService wtWarnPushService;
+
+
+    @PostMapping("/findWtInfo")
+    @ResponseBody
+    @ApiOperation(value = "风机信息", notes = "风机信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findWtInfo(String wtId) throws Exception {
+
+
+        Map<String, Object> map=  new HashMap<>();
+
+
+        map=wtInfoPushService.findWtInfo(wtId);
+
+        if (null!=map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+    @PostMapping("/findWtWarnInfo")
+    @ResponseBody
+    @ApiOperation(value = "风机报警信息", notes = "风机报警信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findWtWarnInfo(String wtId) throws Exception {
+
+
+        Map<String, Object> map=  new HashMap<>();
+
+
+        map=wtWarnPushService.findWtWarnInfo(wtId);
+
+        if (null!=map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+    @PostMapping("/findWtInfoList")
+    @ResponseBody
+    @ApiOperation(value = "风机信息列表", notes = "风机信息列表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findWtInfoList(String wtId) throws Exception {
+
+
+        List<Map<String, Object>> vos=  new ArrayList<>();
+
+
+        vos=wtInfoPushService.findWtInfoList(wtId);
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+}

+ 67 - 0
src/main/java/com/gyee/frame/controller/report/WtHealthReport3Controller.java

@@ -0,0 +1,67 @@
+package com.gyee.frame.controller.report;
+
+import com.gyee.frame.common.base.BaseController;
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.service.report.WtHealthReport3Service;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Controller
+@RequestMapping("/reportnew")
+@Api(value = "日健康报告",tags =  "日健康报告")
+public class WtHealthReport3Controller extends BaseController {
+	private static Logger logger = LoggerFactory.getLogger(WtHealthReport3Controller.class);
+
+	@Resource
+	private WtHealthReport3Service wtHealthReport3Service;
+
+	/**
+	 * 查询健康报告主表和子表数据
+	 * @param wtId
+	 * @param recorddate
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/healthReport")
+	@ResponseBody
+	@ApiOperation(value = "查询健康报告数据", notes = "查询健康报告数据")
+	@ApiImplicitParams({
+
+			@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+			@ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+	public AjaxResult healthReport(String wtId, String recorddate) throws Exception {
+
+		Map<String,Object> map=new HashMap<>();
+
+		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+		{
+
+			Date date= DateUtils.parseDate(recorddate);
+
+			map=wtHealthReport3Service.healthReport(wtId, date);
+		}
+
+		return AjaxResult.successData(AjaxStatus.success.code, map);
+
+	}
+
+
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/WtReportFault3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.WtReportFault3;
+import com.gyee.frame.model.auto.WtReportFault3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface WtReportFault3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    long countByExample(WtReportFault3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(WtReportFault3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int insert(WtReportFault3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(WtReportFault3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    List<WtReportFault3> selectByExample(WtReportFault3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    WtReportFault3 selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") WtReportFault3 record, @Param("example") WtReportFault3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") WtReportFault3 record, @Param("example") WtReportFault3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(WtReportFault3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(WtReportFault3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreport3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreport3;
+import com.gyee.frame.model.auto.Wttragetreport3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreport3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreport3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreport3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreport3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreport3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreport3> selectByExample(Wttragetreport3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    Wttragetreport3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreport3 record, @Param("example") Wttragetreport3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreport3 record, @Param("example") Wttragetreport3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreport3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreport3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreportchart3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreportchart3;
+import com.gyee.frame.model.auto.Wttragetreportchart3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreportchart3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreportchart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreportchart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreportchart3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreportchart3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreportchart3> selectByExample(Wttragetreportchart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    Wttragetreportchart3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreportchart3 record, @Param("example") Wttragetreportchart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreportchart3 record, @Param("example") Wttragetreportchart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreportchart3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreportchart3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreportfnlyl3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreportfnlyl3;
+import com.gyee.frame.model.auto.Wttragetreportfnlyl3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreportfnlyl3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreportfnlyl3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreportfnlyl3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreportfnlyl3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreportfnlyl3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreportfnlyl3> selectByExample(Wttragetreportfnlyl3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    Wttragetreportfnlyl3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreportfnlyl3 record, @Param("example") Wttragetreportfnlyl3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreportfnlyl3 record, @Param("example") Wttragetreportfnlyl3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreportfnlyl3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreportfnlyl3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreportkkxfx3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreportkkxfx3;
+import com.gyee.frame.model.auto.Wttragetreportkkxfx3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreportkkxfx3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreportkkxfx3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreportkkxfx3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreportkkxfx3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreportkkxfx3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreportkkxfx3> selectByExample(Wttragetreportkkxfx3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    Wttragetreportkkxfx3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreportkkxfx3 record, @Param("example") Wttragetreportkkxfx3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreportkkxfx3 record, @Param("example") Wttragetreportkkxfx3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreportkkxfx3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreportkkxfx3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreportmain3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreportmain3;
+import com.gyee.frame.model.auto.Wttragetreportmain3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreportmain3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreportmain3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreportmain3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreportmain3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreportmain3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreportmain3> selectByExample(Wttragetreportmain3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    Wttragetreportmain3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreportmain3 record, @Param("example") Wttragetreportmain3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreportmain3 record, @Param("example") Wttragetreportmain3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreportmain3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTMAIN3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreportmain3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreportpart3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreportpart3;
+import com.gyee.frame.model.auto.Wttragetreportpart3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreportpart3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreportpart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreportpart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreportpart3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreportpart3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreportpart3> selectByExample(Wttragetreportpart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    Wttragetreportpart3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreportpart3 record, @Param("example") Wttragetreportpart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreportpart3 record, @Param("example") Wttragetreportpart3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreportpart3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreportpart3 record);
+}

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/Wttragetreportxndjpj3Mapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Wttragetreportxndjpj3;
+import com.gyee.frame.model.auto.Wttragetreportxndjpj3Example;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Wttragetreportxndjpj3Mapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    long countByExample(Wttragetreportxndjpj3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(Wttragetreportxndjpj3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int insert(Wttragetreportxndjpj3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Wttragetreportxndjpj3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    List<Wttragetreportxndjpj3> selectByExample(Wttragetreportxndjpj3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    Wttragetreportxndjpj3 selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Wttragetreportxndjpj3 record, @Param("example") Wttragetreportxndjpj3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Wttragetreportxndjpj3 record, @Param("example") Wttragetreportxndjpj3Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Wttragetreportxndjpj3 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Wttragetreportxndjpj3 record);
+}

+ 872 - 0
src/main/java/com/gyee/frame/model/auto/WtReportFault3.java

@@ -0,0 +1,872 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WtReportFault3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.TID
+     *
+     * @mbg.generated
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.RECODEDATE
+     *
+     * @mbg.generated
+     */
+    private Date recodedate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.MAINREASON
+     *
+     * @mbg.generated
+     */
+    private String mainreason;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.MAINDATE
+     *
+     * @mbg.generated
+     */
+    private Date maindate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.SPEED
+     *
+     * @mbg.generated
+     */
+    private Double speed;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.MAINMETHOD
+     *
+     * @mbg.generated
+     */
+    private String mainmethod;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.APPROACH
+     *
+     * @mbg.generated
+     */
+    private String approach;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.TOOLS
+     *
+     * @mbg.generated
+     */
+    private String tools;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.MAINHOUR
+     *
+     * @mbg.generated
+     */
+    private Double mainhour;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.GZTOP1
+     *
+     * @mbg.generated
+     */
+    private Integer gztop1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.GZTOP1NAME
+     *
+     * @mbg.generated
+     */
+    private String gztop1name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.GZTOP2
+     *
+     * @mbg.generated
+     */
+    private Integer gztop2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.GZTOP2NAME
+     *
+     * @mbg.generated
+     */
+    private String gztop2name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.GZTOP3
+     *
+     * @mbg.generated
+     */
+    private Integer gztop3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.GZTOP3NAME
+     *
+     * @mbg.generated
+     */
+    private String gztop3name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.YJTOP1
+     *
+     * @mbg.generated
+     */
+    private Integer yjtop1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.YJTOP1NAME
+     *
+     * @mbg.generated
+     */
+    private String yjtop1name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.YJTOP2
+     *
+     * @mbg.generated
+     */
+    private Integer yjtop2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.YJTOP2NAME
+     *
+     * @mbg.generated
+     */
+    private String yjtop2name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.YJTOP3
+     *
+     * @mbg.generated
+     */
+    private Integer yjtop3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.YJTOP3NAME
+     *
+     * @mbg.generated
+     */
+    private String yjtop3name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.TOP1TYPE
+     *
+     * @mbg.generated
+     */
+    private String top1type;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.TOP2TYPE
+     *
+     * @mbg.generated
+     */
+    private String top2type;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTREPORTFAULT3.TOP3TYPE
+     *
+     * @mbg.generated
+     */
+    private String top3type;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTREPORTFAULT3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.ID
+     *
+     * @return the value of WTREPORTFAULT3.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.ID
+     *
+     * @param id the value for WTREPORTFAULT3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.TID
+     *
+     * @return the value of WTREPORTFAULT3.TID
+     *
+     * @mbg.generated
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.TID
+     *
+     * @param tid the value for WTREPORTFAULT3.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.RECODEDATE
+     *
+     * @return the value of WTREPORTFAULT3.RECODEDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecodedate() {
+        return recodedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.RECODEDATE
+     *
+     * @param recodedate the value for WTREPORTFAULT3.RECODEDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecodedate(Date recodedate) {
+        this.recodedate = recodedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.WTID
+     *
+     * @return the value of WTREPORTFAULT3.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.WTID
+     *
+     * @param wtid the value for WTREPORTFAULT3.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.MAINREASON
+     *
+     * @return the value of WTREPORTFAULT3.MAINREASON
+     *
+     * @mbg.generated
+     */
+    public String getMainreason() {
+        return mainreason;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.MAINREASON
+     *
+     * @param mainreason the value for WTREPORTFAULT3.MAINREASON
+     *
+     * @mbg.generated
+     */
+    public void setMainreason(String mainreason) {
+        this.mainreason = mainreason == null ? null : mainreason.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.MAINDATE
+     *
+     * @return the value of WTREPORTFAULT3.MAINDATE
+     *
+     * @mbg.generated
+     */
+    public Date getMaindate() {
+        return maindate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.MAINDATE
+     *
+     * @param maindate the value for WTREPORTFAULT3.MAINDATE
+     *
+     * @mbg.generated
+     */
+    public void setMaindate(Date maindate) {
+        this.maindate = maindate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.SPEED
+     *
+     * @return the value of WTREPORTFAULT3.SPEED
+     *
+     * @mbg.generated
+     */
+    public Double getSpeed() {
+        return speed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.SPEED
+     *
+     * @param speed the value for WTREPORTFAULT3.SPEED
+     *
+     * @mbg.generated
+     */
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.MAINMETHOD
+     *
+     * @return the value of WTREPORTFAULT3.MAINMETHOD
+     *
+     * @mbg.generated
+     */
+    public String getMainmethod() {
+        return mainmethod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.MAINMETHOD
+     *
+     * @param mainmethod the value for WTREPORTFAULT3.MAINMETHOD
+     *
+     * @mbg.generated
+     */
+    public void setMainmethod(String mainmethod) {
+        this.mainmethod = mainmethod == null ? null : mainmethod.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.APPROACH
+     *
+     * @return the value of WTREPORTFAULT3.APPROACH
+     *
+     * @mbg.generated
+     */
+    public String getApproach() {
+        return approach;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.APPROACH
+     *
+     * @param approach the value for WTREPORTFAULT3.APPROACH
+     *
+     * @mbg.generated
+     */
+    public void setApproach(String approach) {
+        this.approach = approach == null ? null : approach.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.TOOLS
+     *
+     * @return the value of WTREPORTFAULT3.TOOLS
+     *
+     * @mbg.generated
+     */
+    public String getTools() {
+        return tools;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.TOOLS
+     *
+     * @param tools the value for WTREPORTFAULT3.TOOLS
+     *
+     * @mbg.generated
+     */
+    public void setTools(String tools) {
+        this.tools = tools == null ? null : tools.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.MAINHOUR
+     *
+     * @return the value of WTREPORTFAULT3.MAINHOUR
+     *
+     * @mbg.generated
+     */
+    public Double getMainhour() {
+        return mainhour;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.MAINHOUR
+     *
+     * @param mainhour the value for WTREPORTFAULT3.MAINHOUR
+     *
+     * @mbg.generated
+     */
+    public void setMainhour(Double mainhour) {
+        this.mainhour = mainhour;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.GZTOP1
+     *
+     * @return the value of WTREPORTFAULT3.GZTOP1
+     *
+     * @mbg.generated
+     */
+    public Integer getGztop1() {
+        return gztop1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.GZTOP1
+     *
+     * @param gztop1 the value for WTREPORTFAULT3.GZTOP1
+     *
+     * @mbg.generated
+     */
+    public void setGztop1(Integer gztop1) {
+        this.gztop1 = gztop1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.GZTOP1NAME
+     *
+     * @return the value of WTREPORTFAULT3.GZTOP1NAME
+     *
+     * @mbg.generated
+     */
+    public String getGztop1name() {
+        return gztop1name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.GZTOP1NAME
+     *
+     * @param gztop1name the value for WTREPORTFAULT3.GZTOP1NAME
+     *
+     * @mbg.generated
+     */
+    public void setGztop1name(String gztop1name) {
+        this.gztop1name = gztop1name == null ? null : gztop1name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.GZTOP2
+     *
+     * @return the value of WTREPORTFAULT3.GZTOP2
+     *
+     * @mbg.generated
+     */
+    public Integer getGztop2() {
+        return gztop2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.GZTOP2
+     *
+     * @param gztop2 the value for WTREPORTFAULT3.GZTOP2
+     *
+     * @mbg.generated
+     */
+    public void setGztop2(Integer gztop2) {
+        this.gztop2 = gztop2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.GZTOP2NAME
+     *
+     * @return the value of WTREPORTFAULT3.GZTOP2NAME
+     *
+     * @mbg.generated
+     */
+    public String getGztop2name() {
+        return gztop2name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.GZTOP2NAME
+     *
+     * @param gztop2name the value for WTREPORTFAULT3.GZTOP2NAME
+     *
+     * @mbg.generated
+     */
+    public void setGztop2name(String gztop2name) {
+        this.gztop2name = gztop2name == null ? null : gztop2name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.GZTOP3
+     *
+     * @return the value of WTREPORTFAULT3.GZTOP3
+     *
+     * @mbg.generated
+     */
+    public Integer getGztop3() {
+        return gztop3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.GZTOP3
+     *
+     * @param gztop3 the value for WTREPORTFAULT3.GZTOP3
+     *
+     * @mbg.generated
+     */
+    public void setGztop3(Integer gztop3) {
+        this.gztop3 = gztop3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.GZTOP3NAME
+     *
+     * @return the value of WTREPORTFAULT3.GZTOP3NAME
+     *
+     * @mbg.generated
+     */
+    public String getGztop3name() {
+        return gztop3name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.GZTOP3NAME
+     *
+     * @param gztop3name the value for WTREPORTFAULT3.GZTOP3NAME
+     *
+     * @mbg.generated
+     */
+    public void setGztop3name(String gztop3name) {
+        this.gztop3name = gztop3name == null ? null : gztop3name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.YJTOP1
+     *
+     * @return the value of WTREPORTFAULT3.YJTOP1
+     *
+     * @mbg.generated
+     */
+    public Integer getYjtop1() {
+        return yjtop1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.YJTOP1
+     *
+     * @param yjtop1 the value for WTREPORTFAULT3.YJTOP1
+     *
+     * @mbg.generated
+     */
+    public void setYjtop1(Integer yjtop1) {
+        this.yjtop1 = yjtop1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.YJTOP1NAME
+     *
+     * @return the value of WTREPORTFAULT3.YJTOP1NAME
+     *
+     * @mbg.generated
+     */
+    public String getYjtop1name() {
+        return yjtop1name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.YJTOP1NAME
+     *
+     * @param yjtop1name the value for WTREPORTFAULT3.YJTOP1NAME
+     *
+     * @mbg.generated
+     */
+    public void setYjtop1name(String yjtop1name) {
+        this.yjtop1name = yjtop1name == null ? null : yjtop1name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.YJTOP2
+     *
+     * @return the value of WTREPORTFAULT3.YJTOP2
+     *
+     * @mbg.generated
+     */
+    public Integer getYjtop2() {
+        return yjtop2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.YJTOP2
+     *
+     * @param yjtop2 the value for WTREPORTFAULT3.YJTOP2
+     *
+     * @mbg.generated
+     */
+    public void setYjtop2(Integer yjtop2) {
+        this.yjtop2 = yjtop2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.YJTOP2NAME
+     *
+     * @return the value of WTREPORTFAULT3.YJTOP2NAME
+     *
+     * @mbg.generated
+     */
+    public String getYjtop2name() {
+        return yjtop2name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.YJTOP2NAME
+     *
+     * @param yjtop2name the value for WTREPORTFAULT3.YJTOP2NAME
+     *
+     * @mbg.generated
+     */
+    public void setYjtop2name(String yjtop2name) {
+        this.yjtop2name = yjtop2name == null ? null : yjtop2name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.YJTOP3
+     *
+     * @return the value of WTREPORTFAULT3.YJTOP3
+     *
+     * @mbg.generated
+     */
+    public Integer getYjtop3() {
+        return yjtop3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.YJTOP3
+     *
+     * @param yjtop3 the value for WTREPORTFAULT3.YJTOP3
+     *
+     * @mbg.generated
+     */
+    public void setYjtop3(Integer yjtop3) {
+        this.yjtop3 = yjtop3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.YJTOP3NAME
+     *
+     * @return the value of WTREPORTFAULT3.YJTOP3NAME
+     *
+     * @mbg.generated
+     */
+    public String getYjtop3name() {
+        return yjtop3name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.YJTOP3NAME
+     *
+     * @param yjtop3name the value for WTREPORTFAULT3.YJTOP3NAME
+     *
+     * @mbg.generated
+     */
+    public void setYjtop3name(String yjtop3name) {
+        this.yjtop3name = yjtop3name == null ? null : yjtop3name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.TOP1TYPE
+     *
+     * @return the value of WTREPORTFAULT3.TOP1TYPE
+     *
+     * @mbg.generated
+     */
+    public String getTop1type() {
+        return top1type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.TOP1TYPE
+     *
+     * @param top1type the value for WTREPORTFAULT3.TOP1TYPE
+     *
+     * @mbg.generated
+     */
+    public void setTop1type(String top1type) {
+        this.top1type = top1type == null ? null : top1type.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.TOP2TYPE
+     *
+     * @return the value of WTREPORTFAULT3.TOP2TYPE
+     *
+     * @mbg.generated
+     */
+    public String getTop2type() {
+        return top2type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.TOP2TYPE
+     *
+     * @param top2type the value for WTREPORTFAULT3.TOP2TYPE
+     *
+     * @mbg.generated
+     */
+    public void setTop2type(String top2type) {
+        this.top2type = top2type == null ? null : top2type.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTREPORTFAULT3.TOP3TYPE
+     *
+     * @return the value of WTREPORTFAULT3.TOP3TYPE
+     *
+     * @mbg.generated
+     */
+    public String getTop3type() {
+        return top3type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTREPORTFAULT3.TOP3TYPE
+     *
+     * @param top3type the value for WTREPORTFAULT3.TOP3TYPE
+     *
+     * @mbg.generated
+     */
+    public void setTop3type(String top3type) {
+        this.top3type = top3type == null ? null : top3type.trim();
+    }
+}

Plik diff jest za duży
+ 2013 - 0
src/main/java/com/gyee/frame/model/auto/WtReportFault3Example.java


+ 179 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreport3.java

@@ -0,0 +1,179 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wttragetreport3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORT3.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORT3.RECODEDATE
+     *
+     * @mbg.generated
+     */
+    private Date recodedate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORT3.CREATEDATE
+     *
+     * @mbg.generated
+     */
+    private Date createdate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORT3.YEAR
+     *
+     * @mbg.generated
+     */
+    private Integer year;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORT3.MONTH
+     *
+     * @mbg.generated
+     */
+    private Integer month;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORT3.ID
+     *
+     * @return the value of WTTRAGETREPORT3.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORT3.ID
+     *
+     * @param id the value for WTTRAGETREPORT3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORT3.RECODEDATE
+     *
+     * @return the value of WTTRAGETREPORT3.RECODEDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecodedate() {
+        return recodedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORT3.RECODEDATE
+     *
+     * @param recodedate the value for WTTRAGETREPORT3.RECODEDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecodedate(Date recodedate) {
+        this.recodedate = recodedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORT3.CREATEDATE
+     *
+     * @return the value of WTTRAGETREPORT3.CREATEDATE
+     *
+     * @mbg.generated
+     */
+    public Date getCreatedate() {
+        return createdate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORT3.CREATEDATE
+     *
+     * @param createdate the value for WTTRAGETREPORT3.CREATEDATE
+     *
+     * @mbg.generated
+     */
+    public void setCreatedate(Date createdate) {
+        this.createdate = createdate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORT3.YEAR
+     *
+     * @return the value of WTTRAGETREPORT3.YEAR
+     *
+     * @mbg.generated
+     */
+    public Integer getYear() {
+        return year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORT3.YEAR
+     *
+     * @param year the value for WTTRAGETREPORT3.YEAR
+     *
+     * @mbg.generated
+     */
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORT3.MONTH
+     *
+     * @return the value of WTTRAGETREPORT3.MONTH
+     *
+     * @mbg.generated
+     */
+    public Integer getMonth() {
+        return month;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORT3.MONTH
+     *
+     * @param month the value for WTTRAGETREPORT3.MONTH
+     *
+     * @mbg.generated
+     */
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+}

+ 603 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreport3Example.java

@@ -0,0 +1,603 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Wttragetreport3Example {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public Wttragetreport3Example() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateIsNull() {
+            addCriterion("RECODEDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateIsNotNull() {
+            addCriterion("RECODEDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateEqualTo(Date value) {
+            addCriterion("RECODEDATE =", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateNotEqualTo(Date value) {
+            addCriterion("RECODEDATE <>", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateGreaterThan(Date value) {
+            addCriterion("RECODEDATE >", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateGreaterThanOrEqualTo(Date value) {
+            addCriterion("RECODEDATE >=", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateLessThan(Date value) {
+            addCriterion("RECODEDATE <", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateLessThanOrEqualTo(Date value) {
+            addCriterion("RECODEDATE <=", value, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateIn(List<Date> values) {
+            addCriterion("RECODEDATE in", values, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateNotIn(List<Date> values) {
+            addCriterion("RECODEDATE not in", values, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateBetween(Date value1, Date value2) {
+            addCriterion("RECODEDATE between", value1, value2, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecodedateNotBetween(Date value1, Date value2) {
+            addCriterion("RECODEDATE not between", value1, value2, "recodedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateIsNull() {
+            addCriterion("CREATEDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateIsNotNull() {
+            addCriterion("CREATEDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateEqualTo(Date value) {
+            addCriterion("CREATEDATE =", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateNotEqualTo(Date value) {
+            addCriterion("CREATEDATE <>", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateGreaterThan(Date value) {
+            addCriterion("CREATEDATE >", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateGreaterThanOrEqualTo(Date value) {
+            addCriterion("CREATEDATE >=", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateLessThan(Date value) {
+            addCriterion("CREATEDATE <", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateLessThanOrEqualTo(Date value) {
+            addCriterion("CREATEDATE <=", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateIn(List<Date> values) {
+            addCriterion("CREATEDATE in", values, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateNotIn(List<Date> values) {
+            addCriterion("CREATEDATE not in", values, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateBetween(Date value1, Date value2) {
+            addCriterion("CREATEDATE between", value1, value2, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateNotBetween(Date value1, Date value2) {
+            addCriterion("CREATEDATE not between", value1, value2, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNull() {
+            addCriterion("YEAR is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNotNull() {
+            addCriterion("YEAR is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearEqualTo(Integer value) {
+            addCriterion("YEAR =", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotEqualTo(Integer value) {
+            addCriterion("YEAR <>", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThan(Integer value) {
+            addCriterion("YEAR >", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThanOrEqualTo(Integer value) {
+            addCriterion("YEAR >=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThan(Integer value) {
+            addCriterion("YEAR <", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThanOrEqualTo(Integer value) {
+            addCriterion("YEAR <=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIn(List<Integer> values) {
+            addCriterion("YEAR in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotIn(List<Integer> values) {
+            addCriterion("YEAR not in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearBetween(Integer value1, Integer value2) {
+            addCriterion("YEAR between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotBetween(Integer value1, Integer value2) {
+            addCriterion("YEAR not between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNull() {
+            addCriterion("MONTH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNotNull() {
+            addCriterion("MONTH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthEqualTo(Integer value) {
+            addCriterion("MONTH =", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotEqualTo(Integer value) {
+            addCriterion("MONTH <>", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThan(Integer value) {
+            addCriterion("MONTH >", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThanOrEqualTo(Integer value) {
+            addCriterion("MONTH >=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThan(Integer value) {
+            addCriterion("MONTH <", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThanOrEqualTo(Integer value) {
+            addCriterion("MONTH <=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIn(List<Integer> values) {
+            addCriterion("MONTH in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotIn(List<Integer> values) {
+            addCriterion("MONTH not in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthBetween(Integer value1, Integer value2) {
+            addCriterion("MONTH between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotBetween(Integer value1, Integer value2) {
+            addCriterion("MONTH not between", value1, value2, "month");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORT3
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 312 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportchart3.java

@@ -0,0 +1,312 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Wttragetreportchart3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.TID
+     *
+     * @mbg.generated
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.PARTID
+     *
+     * @mbg.generated
+     */
+    private String partid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.PARTNAME
+     *
+     * @mbg.generated
+     */
+    private String partname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.VALUE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal value;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.PARENTID
+     *
+     * @mbg.generated
+     */
+    private String parentid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTCHART3.WTNAME
+     *
+     * @mbg.generated
+     */
+    private String wtname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.ID
+     *
+     * @return the value of WTTRAGETREPORTCHART3.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.ID
+     *
+     * @param id the value for WTTRAGETREPORTCHART3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.TID
+     *
+     * @return the value of WTTRAGETREPORTCHART3.TID
+     *
+     * @mbg.generated
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.TID
+     *
+     * @param tid the value for WTTRAGETREPORTCHART3.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.PARTID
+     *
+     * @return the value of WTTRAGETREPORTCHART3.PARTID
+     *
+     * @mbg.generated
+     */
+    public String getPartid() {
+        return partid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.PARTID
+     *
+     * @param partid the value for WTTRAGETREPORTCHART3.PARTID
+     *
+     * @mbg.generated
+     */
+    public void setPartid(String partid) {
+        this.partid = partid == null ? null : partid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.PARTNAME
+     *
+     * @return the value of WTTRAGETREPORTCHART3.PARTNAME
+     *
+     * @mbg.generated
+     */
+    public String getPartname() {
+        return partname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.PARTNAME
+     *
+     * @param partname the value for WTTRAGETREPORTCHART3.PARTNAME
+     *
+     * @mbg.generated
+     */
+    public void setPartname(String partname) {
+        this.partname = partname == null ? null : partname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.RECORDDATE
+     *
+     * @return the value of WTTRAGETREPORTCHART3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.RECORDDATE
+     *
+     * @param recorddate the value for WTTRAGETREPORTCHART3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.VALUE
+     *
+     * @return the value of WTTRAGETREPORTCHART3.VALUE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.VALUE
+     *
+     * @param value the value for WTTRAGETREPORTCHART3.VALUE
+     *
+     * @mbg.generated
+     */
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.PARENTID
+     *
+     * @return the value of WTTRAGETREPORTCHART3.PARENTID
+     *
+     * @mbg.generated
+     */
+    public String getParentid() {
+        return parentid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.PARENTID
+     *
+     * @param parentid the value for WTTRAGETREPORTCHART3.PARENTID
+     *
+     * @mbg.generated
+     */
+    public void setParentid(String parentid) {
+        this.parentid = parentid == null ? null : parentid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.WTID
+     *
+     * @return the value of WTTRAGETREPORTCHART3.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.WTID
+     *
+     * @param wtid the value for WTTRAGETREPORTCHART3.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTCHART3.WTNAME
+     *
+     * @return the value of WTTRAGETREPORTCHART3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public String getWtname() {
+        return wtname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTCHART3.WTNAME
+     *
+     * @param wtname the value for WTTRAGETREPORTCHART3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public void setWtname(String wtname) {
+        this.wtname = wtname == null ? null : wtname.trim();
+    }
+}

+ 894 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportchart3Example.java

@@ -0,0 +1,894 @@
+package com.gyee.frame.model.auto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Wttragetreportchart3Example {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public Wttragetreportchart3Example() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNull() {
+            addCriterion("TID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNotNull() {
+            addCriterion("TID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidEqualTo(Integer value) {
+            addCriterion("TID =", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotEqualTo(Integer value) {
+            addCriterion("TID <>", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThan(Integer value) {
+            addCriterion("TID >", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("TID >=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThan(Integer value) {
+            addCriterion("TID <", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThanOrEqualTo(Integer value) {
+            addCriterion("TID <=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIn(List<Integer> values) {
+            addCriterion("TID in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotIn(List<Integer> values) {
+            addCriterion("TID not in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidBetween(Integer value1, Integer value2) {
+            addCriterion("TID between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotBetween(Integer value1, Integer value2) {
+            addCriterion("TID not between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidIsNull() {
+            addCriterion("PARTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidIsNotNull() {
+            addCriterion("PARTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidEqualTo(String value) {
+            addCriterion("PARTID =", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidNotEqualTo(String value) {
+            addCriterion("PARTID <>", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidGreaterThan(String value) {
+            addCriterion("PARTID >", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidGreaterThanOrEqualTo(String value) {
+            addCriterion("PARTID >=", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidLessThan(String value) {
+            addCriterion("PARTID <", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidLessThanOrEqualTo(String value) {
+            addCriterion("PARTID <=", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidLike(String value) {
+            addCriterion("PARTID like", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidNotLike(String value) {
+            addCriterion("PARTID not like", value, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidIn(List<String> values) {
+            addCriterion("PARTID in", values, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidNotIn(List<String> values) {
+            addCriterion("PARTID not in", values, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidBetween(String value1, String value2) {
+            addCriterion("PARTID between", value1, value2, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartidNotBetween(String value1, String value2) {
+            addCriterion("PARTID not between", value1, value2, "partid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameIsNull() {
+            addCriterion("PARTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameIsNotNull() {
+            addCriterion("PARTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameEqualTo(String value) {
+            addCriterion("PARTNAME =", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotEqualTo(String value) {
+            addCriterion("PARTNAME <>", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameGreaterThan(String value) {
+            addCriterion("PARTNAME >", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameGreaterThanOrEqualTo(String value) {
+            addCriterion("PARTNAME >=", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameLessThan(String value) {
+            addCriterion("PARTNAME <", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameLessThanOrEqualTo(String value) {
+            addCriterion("PARTNAME <=", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameLike(String value) {
+            addCriterion("PARTNAME like", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotLike(String value) {
+            addCriterion("PARTNAME not like", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameIn(List<String> values) {
+            addCriterion("PARTNAME in", values, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotIn(List<String> values) {
+            addCriterion("PARTNAME not in", values, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameBetween(String value1, String value2) {
+            addCriterion("PARTNAME between", value1, value2, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotBetween(String value1, String value2) {
+            addCriterion("PARTNAME not between", value1, value2, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNull() {
+            addCriterion("RECORDDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("RECORDDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("RECORDDATE =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("RECORDDATE <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("RECORDDATE >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("RECORDDATE <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("RECORDDATE in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("RECORDDATE not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("VALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("VALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(BigDecimal value) {
+            addCriterion("VALUE =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(BigDecimal value) {
+            addCriterion("VALUE <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(BigDecimal value) {
+            addCriterion("VALUE >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("VALUE >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(BigDecimal value) {
+            addCriterion("VALUE <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("VALUE <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<BigDecimal> values) {
+            addCriterion("VALUE in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<BigDecimal> values) {
+            addCriterion("VALUE not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("VALUE between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("VALUE not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidIsNull() {
+            addCriterion("PARENTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidIsNotNull() {
+            addCriterion("PARENTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidEqualTo(String value) {
+            addCriterion("PARENTID =", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidNotEqualTo(String value) {
+            addCriterion("PARENTID <>", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidGreaterThan(String value) {
+            addCriterion("PARENTID >", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidGreaterThanOrEqualTo(String value) {
+            addCriterion("PARENTID >=", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidLessThan(String value) {
+            addCriterion("PARENTID <", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidLessThanOrEqualTo(String value) {
+            addCriterion("PARENTID <=", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidLike(String value) {
+            addCriterion("PARENTID like", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidNotLike(String value) {
+            addCriterion("PARENTID not like", value, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidIn(List<String> values) {
+            addCriterion("PARENTID in", values, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidNotIn(List<String> values) {
+            addCriterion("PARENTID not in", values, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidBetween(String value1, String value2) {
+            addCriterion("PARENTID between", value1, value2, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentidNotBetween(String value1, String value2) {
+            addCriterion("PARENTID not between", value1, value2, "parentid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIsNull() {
+            addCriterion("WTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIsNotNull() {
+            addCriterion("WTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameEqualTo(String value) {
+            addCriterion("WTNAME =", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotEqualTo(String value) {
+            addCriterion("WTNAME <>", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameGreaterThan(String value) {
+            addCriterion("WTNAME >", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameGreaterThanOrEqualTo(String value) {
+            addCriterion("WTNAME >=", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLessThan(String value) {
+            addCriterion("WTNAME <", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLessThanOrEqualTo(String value) {
+            addCriterion("WTNAME <=", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLike(String value) {
+            addCriterion("WTNAME like", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotLike(String value) {
+            addCriterion("WTNAME not like", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIn(List<String> values) {
+            addCriterion("WTNAME in", values, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotIn(List<String> values) {
+            addCriterion("WTNAME not in", values, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameBetween(String value1, String value2) {
+            addCriterion("WTNAME between", value1, value2, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotBetween(String value1, String value2) {
+            addCriterion("WTNAME not between", value1, value2, "wtname");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTCHART3
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 443 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportfnlyl3.java

@@ -0,0 +1,443 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wttragetreportfnlyl3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.TID
+     *
+     * @mbg.generated
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    private Double q3ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    private Double q2ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    private Double q1ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.YTBZ
+     *
+     * @mbg.generated
+     */
+    private Double ytbz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.YTBQS
+     *
+     * @mbg.generated
+     */
+    private String ytbqs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.YHBZ
+     *
+     * @mbg.generated
+     */
+    private Double yhbz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.YHBQS
+     *
+     * @mbg.generated
+     */
+    private String yhbqs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTFNLYL3.WTNAME
+     *
+     * @mbg.generated
+     */
+    private String wtname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTFNLYL3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.ID
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.ID
+     *
+     * @param id the value for WTTRAGETREPORTFNLYL3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.TID
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.TID
+     *
+     * @mbg.generated
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.TID
+     *
+     * @param tid the value for WTTRAGETREPORTFNLYL3.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.NAME
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.NAME
+     *
+     * @param name the value for WTTRAGETREPORTFNLYL3.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.RECORDDATE
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.RECORDDATE
+     *
+     * @param recorddate the value for WTTRAGETREPORTFNLYL3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.Q3YSJ
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    public Double getQ3ysj() {
+        return q3ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.Q3YSJ
+     *
+     * @param q3ysj the value for WTTRAGETREPORTFNLYL3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ3ysj(Double q3ysj) {
+        this.q3ysj = q3ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.Q2YSJ
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    public Double getQ2ysj() {
+        return q2ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.Q2YSJ
+     *
+     * @param q2ysj the value for WTTRAGETREPORTFNLYL3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ2ysj(Double q2ysj) {
+        this.q2ysj = q2ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.Q1YSJ
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    public Double getQ1ysj() {
+        return q1ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.Q1YSJ
+     *
+     * @param q1ysj the value for WTTRAGETREPORTFNLYL3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ1ysj(Double q1ysj) {
+        this.q1ysj = q1ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.YTBZ
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.YTBZ
+     *
+     * @mbg.generated
+     */
+    public Double getYtbz() {
+        return ytbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.YTBZ
+     *
+     * @param ytbz the value for WTTRAGETREPORTFNLYL3.YTBZ
+     *
+     * @mbg.generated
+     */
+    public void setYtbz(Double ytbz) {
+        this.ytbz = ytbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.YTBQS
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.YTBQS
+     *
+     * @mbg.generated
+     */
+    public String getYtbqs() {
+        return ytbqs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.YTBQS
+     *
+     * @param ytbqs the value for WTTRAGETREPORTFNLYL3.YTBQS
+     *
+     * @mbg.generated
+     */
+    public void setYtbqs(String ytbqs) {
+        this.ytbqs = ytbqs == null ? null : ytbqs.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.YHBZ
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.YHBZ
+     *
+     * @mbg.generated
+     */
+    public Double getYhbz() {
+        return yhbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.YHBZ
+     *
+     * @param yhbz the value for WTTRAGETREPORTFNLYL3.YHBZ
+     *
+     * @mbg.generated
+     */
+    public void setYhbz(Double yhbz) {
+        this.yhbz = yhbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.YHBQS
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.YHBQS
+     *
+     * @mbg.generated
+     */
+    public String getYhbqs() {
+        return yhbqs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.YHBQS
+     *
+     * @param yhbqs the value for WTTRAGETREPORTFNLYL3.YHBQS
+     *
+     * @mbg.generated
+     */
+    public void setYhbqs(String yhbqs) {
+        this.yhbqs = yhbqs == null ? null : yhbqs.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.WTID
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.WTID
+     *
+     * @param wtid the value for WTTRAGETREPORTFNLYL3.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTFNLYL3.WTNAME
+     *
+     * @return the value of WTTRAGETREPORTFNLYL3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public String getWtname() {
+        return wtname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTFNLYL3.WTNAME
+     *
+     * @param wtname the value for WTTRAGETREPORTFNLYL3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public void setWtname(String wtname) {
+        this.wtname = wtname == null ? null : wtname.trim();
+    }
+}

Plik diff jest za duży
+ 1133 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportfnlyl3Example.java


+ 443 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportkkxfx3.java

@@ -0,0 +1,443 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wttragetreportkkxfx3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.TID
+     *
+     * @mbg.generated
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    private Double q3ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    private Double q2ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    private Double q1ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.YTBZ
+     *
+     * @mbg.generated
+     */
+    private Double ytbz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.YTBQS
+     *
+     * @mbg.generated
+     */
+    private String ytbqs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.YHBZ
+     *
+     * @mbg.generated
+     */
+    private Double yhbz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.YHBQS
+     *
+     * @mbg.generated
+     */
+    private String yhbqs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTKKXFX3.WTNAME
+     *
+     * @mbg.generated
+     */
+    private String wtname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTKKXFX3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.ID
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.ID
+     *
+     * @param id the value for WTTRAGETREPORTKKXFX3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.TID
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.TID
+     *
+     * @mbg.generated
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.TID
+     *
+     * @param tid the value for WTTRAGETREPORTKKXFX3.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.NAME
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.NAME
+     *
+     * @param name the value for WTTRAGETREPORTKKXFX3.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.RECORDDATE
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.RECORDDATE
+     *
+     * @param recorddate the value for WTTRAGETREPORTKKXFX3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.Q3YSJ
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    public Double getQ3ysj() {
+        return q3ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.Q3YSJ
+     *
+     * @param q3ysj the value for WTTRAGETREPORTKKXFX3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ3ysj(Double q3ysj) {
+        this.q3ysj = q3ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.Q2YSJ
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    public Double getQ2ysj() {
+        return q2ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.Q2YSJ
+     *
+     * @param q2ysj the value for WTTRAGETREPORTKKXFX3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ2ysj(Double q2ysj) {
+        this.q2ysj = q2ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.Q1YSJ
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    public Double getQ1ysj() {
+        return q1ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.Q1YSJ
+     *
+     * @param q1ysj the value for WTTRAGETREPORTKKXFX3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ1ysj(Double q1ysj) {
+        this.q1ysj = q1ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.YTBZ
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.YTBZ
+     *
+     * @mbg.generated
+     */
+    public Double getYtbz() {
+        return ytbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.YTBZ
+     *
+     * @param ytbz the value for WTTRAGETREPORTKKXFX3.YTBZ
+     *
+     * @mbg.generated
+     */
+    public void setYtbz(Double ytbz) {
+        this.ytbz = ytbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.YTBQS
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.YTBQS
+     *
+     * @mbg.generated
+     */
+    public String getYtbqs() {
+        return ytbqs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.YTBQS
+     *
+     * @param ytbqs the value for WTTRAGETREPORTKKXFX3.YTBQS
+     *
+     * @mbg.generated
+     */
+    public void setYtbqs(String ytbqs) {
+        this.ytbqs = ytbqs == null ? null : ytbqs.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.YHBZ
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.YHBZ
+     *
+     * @mbg.generated
+     */
+    public Double getYhbz() {
+        return yhbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.YHBZ
+     *
+     * @param yhbz the value for WTTRAGETREPORTKKXFX3.YHBZ
+     *
+     * @mbg.generated
+     */
+    public void setYhbz(Double yhbz) {
+        this.yhbz = yhbz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.YHBQS
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.YHBQS
+     *
+     * @mbg.generated
+     */
+    public String getYhbqs() {
+        return yhbqs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.YHBQS
+     *
+     * @param yhbqs the value for WTTRAGETREPORTKKXFX3.YHBQS
+     *
+     * @mbg.generated
+     */
+    public void setYhbqs(String yhbqs) {
+        this.yhbqs = yhbqs == null ? null : yhbqs.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.WTID
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.WTID
+     *
+     * @param wtid the value for WTTRAGETREPORTKKXFX3.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTKKXFX3.WTNAME
+     *
+     * @return the value of WTTRAGETREPORTKKXFX3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public String getWtname() {
+        return wtname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTKKXFX3.WTNAME
+     *
+     * @param wtname the value for WTTRAGETREPORTKKXFX3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public void setWtname(String wtname) {
+        this.wtname = wtname == null ? null : wtname.trim();
+    }
+}

Plik diff jest za duży
+ 1133 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportkkxfx3Example.java


Plik diff jest za duży
+ 1631 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportmain3.java


Plik diff jest za duży
+ 3354 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportmain3Example.java


+ 344 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportpart3.java

@@ -0,0 +1,344 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wttragetreportpart3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.TID
+     *
+     * @mbg.generated
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.PARTNAME
+     *
+     * @mbg.generated
+     */
+    private String partname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.Q3YJKQK
+     *
+     * @mbg.generated
+     */
+    private String q3yjkqk;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.Q2YJKQK
+     *
+     * @mbg.generated
+     */
+    private String q2yjkqk;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.Q1YJKQK
+     *
+     * @mbg.generated
+     */
+    private String q1yjkqk;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.BNJKQK
+     *
+     * @mbg.generated
+     */
+    private String bnjkqk;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTPART3.WTNAME
+     *
+     * @mbg.generated
+     */
+    private String wtname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.ID
+     *
+     * @return the value of WTTRAGETREPORTPART3.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.ID
+     *
+     * @param id the value for WTTRAGETREPORTPART3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.TID
+     *
+     * @return the value of WTTRAGETREPORTPART3.TID
+     *
+     * @mbg.generated
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.TID
+     *
+     * @param tid the value for WTTRAGETREPORTPART3.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.PARTNAME
+     *
+     * @return the value of WTTRAGETREPORTPART3.PARTNAME
+     *
+     * @mbg.generated
+     */
+    public String getPartname() {
+        return partname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.PARTNAME
+     *
+     * @param partname the value for WTTRAGETREPORTPART3.PARTNAME
+     *
+     * @mbg.generated
+     */
+    public void setPartname(String partname) {
+        this.partname = partname == null ? null : partname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.RECORDDATE
+     *
+     * @return the value of WTTRAGETREPORTPART3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.RECORDDATE
+     *
+     * @param recorddate the value for WTTRAGETREPORTPART3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.Q3YJKQK
+     *
+     * @return the value of WTTRAGETREPORTPART3.Q3YJKQK
+     *
+     * @mbg.generated
+     */
+    public String getQ3yjkqk() {
+        return q3yjkqk;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.Q3YJKQK
+     *
+     * @param q3yjkqk the value for WTTRAGETREPORTPART3.Q3YJKQK
+     *
+     * @mbg.generated
+     */
+    public void setQ3yjkqk(String q3yjkqk) {
+        this.q3yjkqk = q3yjkqk == null ? null : q3yjkqk.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.Q2YJKQK
+     *
+     * @return the value of WTTRAGETREPORTPART3.Q2YJKQK
+     *
+     * @mbg.generated
+     */
+    public String getQ2yjkqk() {
+        return q2yjkqk;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.Q2YJKQK
+     *
+     * @param q2yjkqk the value for WTTRAGETREPORTPART3.Q2YJKQK
+     *
+     * @mbg.generated
+     */
+    public void setQ2yjkqk(String q2yjkqk) {
+        this.q2yjkqk = q2yjkqk == null ? null : q2yjkqk.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.Q1YJKQK
+     *
+     * @return the value of WTTRAGETREPORTPART3.Q1YJKQK
+     *
+     * @mbg.generated
+     */
+    public String getQ1yjkqk() {
+        return q1yjkqk;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.Q1YJKQK
+     *
+     * @param q1yjkqk the value for WTTRAGETREPORTPART3.Q1YJKQK
+     *
+     * @mbg.generated
+     */
+    public void setQ1yjkqk(String q1yjkqk) {
+        this.q1yjkqk = q1yjkqk == null ? null : q1yjkqk.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.BNJKQK
+     *
+     * @return the value of WTTRAGETREPORTPART3.BNJKQK
+     *
+     * @mbg.generated
+     */
+    public String getBnjkqk() {
+        return bnjkqk;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.BNJKQK
+     *
+     * @param bnjkqk the value for WTTRAGETREPORTPART3.BNJKQK
+     *
+     * @mbg.generated
+     */
+    public void setBnjkqk(String bnjkqk) {
+        this.bnjkqk = bnjkqk == null ? null : bnjkqk.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.WTID
+     *
+     * @return the value of WTTRAGETREPORTPART3.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.WTID
+     *
+     * @param wtid the value for WTTRAGETREPORTPART3.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTPART3.WTNAME
+     *
+     * @return the value of WTTRAGETREPORTPART3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public String getWtname() {
+        return wtname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTPART3.WTNAME
+     *
+     * @param wtname the value for WTTRAGETREPORTPART3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public void setWtname(String wtname) {
+        this.wtname = wtname == null ? null : wtname.trim();
+    }
+}

+ 973 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportpart3Example.java

@@ -0,0 +1,973 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Wttragetreportpart3Example {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public Wttragetreportpart3Example() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNull() {
+            addCriterion("TID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNotNull() {
+            addCriterion("TID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidEqualTo(Integer value) {
+            addCriterion("TID =", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotEqualTo(Integer value) {
+            addCriterion("TID <>", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThan(Integer value) {
+            addCriterion("TID >", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("TID >=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThan(Integer value) {
+            addCriterion("TID <", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThanOrEqualTo(Integer value) {
+            addCriterion("TID <=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIn(List<Integer> values) {
+            addCriterion("TID in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotIn(List<Integer> values) {
+            addCriterion("TID not in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidBetween(Integer value1, Integer value2) {
+            addCriterion("TID between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotBetween(Integer value1, Integer value2) {
+            addCriterion("TID not between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameIsNull() {
+            addCriterion("PARTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameIsNotNull() {
+            addCriterion("PARTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameEqualTo(String value) {
+            addCriterion("PARTNAME =", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotEqualTo(String value) {
+            addCriterion("PARTNAME <>", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameGreaterThan(String value) {
+            addCriterion("PARTNAME >", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameGreaterThanOrEqualTo(String value) {
+            addCriterion("PARTNAME >=", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameLessThan(String value) {
+            addCriterion("PARTNAME <", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameLessThanOrEqualTo(String value) {
+            addCriterion("PARTNAME <=", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameLike(String value) {
+            addCriterion("PARTNAME like", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotLike(String value) {
+            addCriterion("PARTNAME not like", value, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameIn(List<String> values) {
+            addCriterion("PARTNAME in", values, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotIn(List<String> values) {
+            addCriterion("PARTNAME not in", values, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameBetween(String value1, String value2) {
+            addCriterion("PARTNAME between", value1, value2, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartnameNotBetween(String value1, String value2) {
+            addCriterion("PARTNAME not between", value1, value2, "partname");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNull() {
+            addCriterion("RECORDDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("RECORDDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("RECORDDATE =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("RECORDDATE <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("RECORDDATE >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("RECORDDATE <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("RECORDDATE in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("RECORDDATE not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkIsNull() {
+            addCriterion("Q3YJKQK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkIsNotNull() {
+            addCriterion("Q3YJKQK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkEqualTo(String value) {
+            addCriterion("Q3YJKQK =", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkNotEqualTo(String value) {
+            addCriterion("Q3YJKQK <>", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkGreaterThan(String value) {
+            addCriterion("Q3YJKQK >", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkGreaterThanOrEqualTo(String value) {
+            addCriterion("Q3YJKQK >=", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkLessThan(String value) {
+            addCriterion("Q3YJKQK <", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkLessThanOrEqualTo(String value) {
+            addCriterion("Q3YJKQK <=", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkLike(String value) {
+            addCriterion("Q3YJKQK like", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkNotLike(String value) {
+            addCriterion("Q3YJKQK not like", value, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkIn(List<String> values) {
+            addCriterion("Q3YJKQK in", values, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkNotIn(List<String> values) {
+            addCriterion("Q3YJKQK not in", values, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkBetween(String value1, String value2) {
+            addCriterion("Q3YJKQK between", value1, value2, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3yjkqkNotBetween(String value1, String value2) {
+            addCriterion("Q3YJKQK not between", value1, value2, "q3yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkIsNull() {
+            addCriterion("Q2YJKQK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkIsNotNull() {
+            addCriterion("Q2YJKQK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkEqualTo(String value) {
+            addCriterion("Q2YJKQK =", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkNotEqualTo(String value) {
+            addCriterion("Q2YJKQK <>", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkGreaterThan(String value) {
+            addCriterion("Q2YJKQK >", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkGreaterThanOrEqualTo(String value) {
+            addCriterion("Q2YJKQK >=", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkLessThan(String value) {
+            addCriterion("Q2YJKQK <", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkLessThanOrEqualTo(String value) {
+            addCriterion("Q2YJKQK <=", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkLike(String value) {
+            addCriterion("Q2YJKQK like", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkNotLike(String value) {
+            addCriterion("Q2YJKQK not like", value, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkIn(List<String> values) {
+            addCriterion("Q2YJKQK in", values, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkNotIn(List<String> values) {
+            addCriterion("Q2YJKQK not in", values, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkBetween(String value1, String value2) {
+            addCriterion("Q2YJKQK between", value1, value2, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2yjkqkNotBetween(String value1, String value2) {
+            addCriterion("Q2YJKQK not between", value1, value2, "q2yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkIsNull() {
+            addCriterion("Q1YJKQK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkIsNotNull() {
+            addCriterion("Q1YJKQK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkEqualTo(String value) {
+            addCriterion("Q1YJKQK =", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkNotEqualTo(String value) {
+            addCriterion("Q1YJKQK <>", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkGreaterThan(String value) {
+            addCriterion("Q1YJKQK >", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkGreaterThanOrEqualTo(String value) {
+            addCriterion("Q1YJKQK >=", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkLessThan(String value) {
+            addCriterion("Q1YJKQK <", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkLessThanOrEqualTo(String value) {
+            addCriterion("Q1YJKQK <=", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkLike(String value) {
+            addCriterion("Q1YJKQK like", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkNotLike(String value) {
+            addCriterion("Q1YJKQK not like", value, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkIn(List<String> values) {
+            addCriterion("Q1YJKQK in", values, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkNotIn(List<String> values) {
+            addCriterion("Q1YJKQK not in", values, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkBetween(String value1, String value2) {
+            addCriterion("Q1YJKQK between", value1, value2, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1yjkqkNotBetween(String value1, String value2) {
+            addCriterion("Q1YJKQK not between", value1, value2, "q1yjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkIsNull() {
+            addCriterion("BNJKQK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkIsNotNull() {
+            addCriterion("BNJKQK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkEqualTo(String value) {
+            addCriterion("BNJKQK =", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkNotEqualTo(String value) {
+            addCriterion("BNJKQK <>", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkGreaterThan(String value) {
+            addCriterion("BNJKQK >", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkGreaterThanOrEqualTo(String value) {
+            addCriterion("BNJKQK >=", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkLessThan(String value) {
+            addCriterion("BNJKQK <", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkLessThanOrEqualTo(String value) {
+            addCriterion("BNJKQK <=", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkLike(String value) {
+            addCriterion("BNJKQK like", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkNotLike(String value) {
+            addCriterion("BNJKQK not like", value, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkIn(List<String> values) {
+            addCriterion("BNJKQK in", values, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkNotIn(List<String> values) {
+            addCriterion("BNJKQK not in", values, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkBetween(String value1, String value2) {
+            addCriterion("BNJKQK between", value1, value2, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andBnjkqkNotBetween(String value1, String value2) {
+            addCriterion("BNJKQK not between", value1, value2, "bnjkqk");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIsNull() {
+            addCriterion("WTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIsNotNull() {
+            addCriterion("WTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameEqualTo(String value) {
+            addCriterion("WTNAME =", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotEqualTo(String value) {
+            addCriterion("WTNAME <>", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameGreaterThan(String value) {
+            addCriterion("WTNAME >", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameGreaterThanOrEqualTo(String value) {
+            addCriterion("WTNAME >=", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLessThan(String value) {
+            addCriterion("WTNAME <", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLessThanOrEqualTo(String value) {
+            addCriterion("WTNAME <=", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLike(String value) {
+            addCriterion("WTNAME like", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotLike(String value) {
+            addCriterion("WTNAME not like", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIn(List<String> values) {
+            addCriterion("WTNAME in", values, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotIn(List<String> values) {
+            addCriterion("WTNAME not in", values, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameBetween(String value1, String value2) {
+            addCriterion("WTNAME between", value1, value2, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotBetween(String value1, String value2) {
+            addCriterion("WTNAME not between", value1, value2, "wtname");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTPART3
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 311 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportxndjpj3.java

@@ -0,0 +1,311 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Wttragetreportxndjpj3 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.TID
+     *
+     * @mbg.generated
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    private String q3ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    private String q2ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    private String q1ysj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WTTRAGETREPORTXNDJPJ3.WTNAME
+     *
+     * @mbg.generated
+     */
+    private String wtname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.ID
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.ID
+     *
+     * @param id the value for WTTRAGETREPORTXNDJPJ3.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.TID
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.TID
+     *
+     * @mbg.generated
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.TID
+     *
+     * @param tid the value for WTTRAGETREPORTXNDJPJ3.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.NAME
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.NAME
+     *
+     * @param name the value for WTTRAGETREPORTXNDJPJ3.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.RECORDDATE
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.RECORDDATE
+     *
+     * @param recorddate the value for WTTRAGETREPORTXNDJPJ3.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.Q3YSJ
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    public String getQ3ysj() {
+        return q3ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.Q3YSJ
+     *
+     * @param q3ysj the value for WTTRAGETREPORTXNDJPJ3.Q3YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ3ysj(String q3ysj) {
+        this.q3ysj = q3ysj == null ? null : q3ysj.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.Q2YSJ
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    public String getQ2ysj() {
+        return q2ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.Q2YSJ
+     *
+     * @param q2ysj the value for WTTRAGETREPORTXNDJPJ3.Q2YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ2ysj(String q2ysj) {
+        this.q2ysj = q2ysj == null ? null : q2ysj.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.Q1YSJ
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    public String getQ1ysj() {
+        return q1ysj;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.Q1YSJ
+     *
+     * @param q1ysj the value for WTTRAGETREPORTXNDJPJ3.Q1YSJ
+     *
+     * @mbg.generated
+     */
+    public void setQ1ysj(String q1ysj) {
+        this.q1ysj = q1ysj == null ? null : q1ysj.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.WTID
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.WTID
+     *
+     * @param wtid the value for WTTRAGETREPORTXNDJPJ3.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WTTRAGETREPORTXNDJPJ3.WTNAME
+     *
+     * @return the value of WTTRAGETREPORTXNDJPJ3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public String getWtname() {
+        return wtname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WTTRAGETREPORTXNDJPJ3.WTNAME
+     *
+     * @param wtname the value for WTTRAGETREPORTXNDJPJ3.WTNAME
+     *
+     * @mbg.generated
+     */
+    public void setWtname(String wtname) {
+        this.wtname = wtname == null ? null : wtname.trim();
+    }
+}

+ 903 - 0
src/main/java/com/gyee/frame/model/auto/Wttragetreportxndjpj3Example.java

@@ -0,0 +1,903 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Wttragetreportxndjpj3Example {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public Wttragetreportxndjpj3Example() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNull() {
+            addCriterion("TID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNotNull() {
+            addCriterion("TID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidEqualTo(Integer value) {
+            addCriterion("TID =", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotEqualTo(Integer value) {
+            addCriterion("TID <>", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThan(Integer value) {
+            addCriterion("TID >", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("TID >=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThan(Integer value) {
+            addCriterion("TID <", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThanOrEqualTo(Integer value) {
+            addCriterion("TID <=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIn(List<Integer> values) {
+            addCriterion("TID in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotIn(List<Integer> values) {
+            addCriterion("TID not in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidBetween(Integer value1, Integer value2) {
+            addCriterion("TID between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotBetween(Integer value1, Integer value2) {
+            addCriterion("TID not between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNull() {
+            addCriterion("RECORDDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("RECORDDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("RECORDDATE =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("RECORDDATE <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("RECORDDATE >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("RECORDDATE <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("RECORDDATE in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("RECORDDATE not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjIsNull() {
+            addCriterion("Q3YSJ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjIsNotNull() {
+            addCriterion("Q3YSJ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjEqualTo(String value) {
+            addCriterion("Q3YSJ =", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjNotEqualTo(String value) {
+            addCriterion("Q3YSJ <>", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjGreaterThan(String value) {
+            addCriterion("Q3YSJ >", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjGreaterThanOrEqualTo(String value) {
+            addCriterion("Q3YSJ >=", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjLessThan(String value) {
+            addCriterion("Q3YSJ <", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjLessThanOrEqualTo(String value) {
+            addCriterion("Q3YSJ <=", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjLike(String value) {
+            addCriterion("Q3YSJ like", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjNotLike(String value) {
+            addCriterion("Q3YSJ not like", value, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjIn(List<String> values) {
+            addCriterion("Q3YSJ in", values, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjNotIn(List<String> values) {
+            addCriterion("Q3YSJ not in", values, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjBetween(String value1, String value2) {
+            addCriterion("Q3YSJ between", value1, value2, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ3ysjNotBetween(String value1, String value2) {
+            addCriterion("Q3YSJ not between", value1, value2, "q3ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjIsNull() {
+            addCriterion("Q2YSJ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjIsNotNull() {
+            addCriterion("Q2YSJ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjEqualTo(String value) {
+            addCriterion("Q2YSJ =", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjNotEqualTo(String value) {
+            addCriterion("Q2YSJ <>", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjGreaterThan(String value) {
+            addCriterion("Q2YSJ >", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjGreaterThanOrEqualTo(String value) {
+            addCriterion("Q2YSJ >=", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjLessThan(String value) {
+            addCriterion("Q2YSJ <", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjLessThanOrEqualTo(String value) {
+            addCriterion("Q2YSJ <=", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjLike(String value) {
+            addCriterion("Q2YSJ like", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjNotLike(String value) {
+            addCriterion("Q2YSJ not like", value, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjIn(List<String> values) {
+            addCriterion("Q2YSJ in", values, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjNotIn(List<String> values) {
+            addCriterion("Q2YSJ not in", values, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjBetween(String value1, String value2) {
+            addCriterion("Q2YSJ between", value1, value2, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ2ysjNotBetween(String value1, String value2) {
+            addCriterion("Q2YSJ not between", value1, value2, "q2ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjIsNull() {
+            addCriterion("Q1YSJ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjIsNotNull() {
+            addCriterion("Q1YSJ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjEqualTo(String value) {
+            addCriterion("Q1YSJ =", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjNotEqualTo(String value) {
+            addCriterion("Q1YSJ <>", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjGreaterThan(String value) {
+            addCriterion("Q1YSJ >", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjGreaterThanOrEqualTo(String value) {
+            addCriterion("Q1YSJ >=", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjLessThan(String value) {
+            addCriterion("Q1YSJ <", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjLessThanOrEqualTo(String value) {
+            addCriterion("Q1YSJ <=", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjLike(String value) {
+            addCriterion("Q1YSJ like", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjNotLike(String value) {
+            addCriterion("Q1YSJ not like", value, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjIn(List<String> values) {
+            addCriterion("Q1YSJ in", values, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjNotIn(List<String> values) {
+            addCriterion("Q1YSJ not in", values, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjBetween(String value1, String value2) {
+            addCriterion("Q1YSJ between", value1, value2, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQ1ysjNotBetween(String value1, String value2) {
+            addCriterion("Q1YSJ not between", value1, value2, "q1ysj");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIsNull() {
+            addCriterion("WTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIsNotNull() {
+            addCriterion("WTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameEqualTo(String value) {
+            addCriterion("WTNAME =", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotEqualTo(String value) {
+            addCriterion("WTNAME <>", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameGreaterThan(String value) {
+            addCriterion("WTNAME >", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameGreaterThanOrEqualTo(String value) {
+            addCriterion("WTNAME >=", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLessThan(String value) {
+            addCriterion("WTNAME <", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLessThanOrEqualTo(String value) {
+            addCriterion("WTNAME <=", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameLike(String value) {
+            addCriterion("WTNAME like", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotLike(String value) {
+            addCriterion("WTNAME not like", value, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameIn(List<String> values) {
+            addCriterion("WTNAME in", values, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotIn(List<String> values) {
+            addCriterion("WTNAME not in", values, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameBetween(String value1, String value2) {
+            addCriterion("WTNAME between", value1, value2, "wtname");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtnameNotBetween(String value1, String value2) {
+            addCriterion("WTNAME not between", value1, value2, "wtname");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WTTRAGETREPORTXNDJPJ3
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 9 - 0
src/main/java/com/gyee/frame/model/custom/MatrixVo.java

@@ -10,6 +10,15 @@ public class MatrixVo {
 	private Double fs;
     private Double gl;
     private Double fdl;
+    private Double fdjzs;
+
+	public Double getFdjzs() {
+		return fdjzs;
+	}
+
+	public void setFdjzs(Double fdjzs) {
+		this.fdjzs = fdjzs;
+	}
 
 	public String getWpId() {
 		return wpId;

+ 61 - 3
src/main/java/com/gyee/frame/service/ShutdowneventService.java

@@ -15,9 +15,9 @@ import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
 
 
 @Service
@@ -211,6 +211,64 @@ public class ShutdowneventService implements BaseService<Shutdownevent, Shutdown
 
 	}
 
+	/**
+	 * 获取MTTR和MTBF
+	 * @param wtIds
+	 * @return
+	 */
+	public Map<String,Object> queryMttrAndMtbf(List<String> wtIds) {
+
+		Map<String,Object> map=new HashMap<>();
+		List<Shutdownevent> list=new ArrayList<>();
 
 
+		Calendar c = Calendar.getInstance();
+		// c.add(Calendar.MONTH, 0);
+		c.set(Calendar.DAY_OF_MONTH, 1);
+		c.set(Calendar.HOUR_OF_DAY, 0);
+		c.set(Calendar.MINUTE, 0);
+		c.set(Calendar.SECOND, 0);
+		c.set(Calendar.MILLISECOND, 0);
+
+		Date beginDate=c.getTime();
+		c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+		Date endDate=c.getTime();
+		ShutdowneventExample example=new ShutdowneventExample();
+		example.setOrderByClause(" StopTime ASC");
+
+		int daynum=c.get(Calendar.DAY_OF_MONTH);
+		ShutdowneventExample.Criteria criteria =example.createCriteria();
+
+		if(StringUtils.isNotEmpty(wtIds))
+		{
+			criteria.andWindturbineidIn(wtIds);
+		}
+		criteria.andStoptimeGreaterThanOrEqualTo(beginDate).andStoptimeLessThanOrEqualTo(endDate);
+		criteria.andStophoursIsNotNull();
+		criteria.andStoptypeidNotEqualTo("wh");
+
+		list= shutdowneventMapper.selectByExample(example);
+
+
+		double stophours=0.0;
+
+		if(!list.isEmpty())
+		{
+			for(Shutdownevent sde:list)
+			{
+				stophours=stophours+sde.getStophours();
+			}
+
+
+			double mttr= new BigDecimal(stophours).divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP).doubleValue();
+			map.put("mttr",mttr);
+			int dayhours=daynum*24*list.size();
+			double stophoursall=dayhours-stophours;
+			double mtbf = new BigDecimal(stophoursall).divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP).doubleValue();;// 平均间隔时间
+			map.put("mtbf",mtbf);
+		}
+
+		return map;
+
+	}
 }

+ 2 - 0
src/main/java/com/gyee/frame/service/WindTurbineTestingPointDiService.java

@@ -158,10 +158,12 @@ public class WindTurbineTestingPointDiService implements BaseService<WindTurbine
 
 		List<WindTurbineTestingPointDi2> list=new ArrayList<>();
 
+
 		if(StringUtils.notEmp(wtId)  && StringUtils.notEmp(unicoadels))
 		{
 			WindTurbineTestingPointDi2Example example=new WindTurbineTestingPointDi2Example();
 			example.setOrderByClause("id ASC");
+			example.isDistinct();
 			WindTurbineTestingPointDi2Example.Criteria criteria =example.createCriteria();
 			criteria.andWindturbineidEqualTo(wtId);
 			criteria.andUniformcodeIn(unicoadels);

+ 310 - 0
src/main/java/com/gyee/frame/service/report/WtHealthReport3Service.java

@@ -0,0 +1,310 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 线路 LineService
+ *
+ * @author gyee_自动生成
+ * @Title: LineService.java 
+ * @Package com.gyee.frame.service 
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WtHealthReport3Service {
+
+    @Resource
+    private Wttragetreport3Service wttragetreport3Service;
+    @Resource
+    private Wttragetreportchart3Service wttragetreportchart3Service;
+    @Resource
+    private Wttragetreportfnlyl3Service wttragetreportfnlyl3Service;
+    @Resource
+    private Wttragetreportkkxfx3Service wttragetreportkkxfx3Service;
+    @Resource
+    private Wttragetreportmain3Service wttragetreportmain3Service;
+    @Resource
+    private Wttragetreportpart3Service wttragetreportpart3Service;
+    @Resource
+    private Wttragetreportxndjpj3Service wttragetreportxndjpj3Service;
+    @Resource
+    private WtReportFault3Service wtReportFault3Service;
+
+    //评价等级
+    private String PJDJ = "pjdj";
+    //评价结果
+    private String PJJG = "pjjg";
+
+    /**
+     * 查询健康报告
+     *
+     * @return
+     */
+    public Map<String, Object> healthReport(String wtId, Date recorddate) {
+
+        Map<String, Object> map = new HashMap<>();
+
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate)) {
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(recorddate);
+
+            int year = cal.get(Calendar.YEAR);
+            int month = cal.get(Calendar.MONTH) + 1;
+
+            if (InitialRunner.wtmap.containsKey(wtId)) {
+                Windturbine wt = InitialRunner.wtmap.get(wtId);
+
+                List<Wttragetreport3> wtreportls = wttragetreport3Service.findWttragetreport3(wtId, year, month);
+
+                if (!wtreportls.isEmpty()) {
+                    //获得健康报告主表信息
+                    Wttragetreport3 wtreport = wtreportls.get(0);
+
+                    Map<String, Object> jczbmap = new HashMap<>();
+                    //风机编号
+                    jczbmap.put("fjbh", wt.getCode());
+                    //风机名称
+                    jczbmap.put("fjmc", wt.getName());
+					/*******************************基础指标****************************************/
+                    //获得基础指标表数据
+                    List<Wttragetreportmain3> mainls = wttragetreportmain3Service.findWttragetreportmain3(wtreport.getId(), wtId);
+
+                    if (!mainls.isEmpty()) {
+                        Wttragetreportmain3 wttragetreportmain3 = mainls.get(0);
+
+                        String datestr = DateUtils.format(wttragetreportmain3.getRecodedate());
+                        //报告日期
+                        jczbmap.put("bgrq", datestr);
+                        //评级等级
+                        jczbmap.put(PJDJ, wttragetreportmain3.getPjdj());
+                        //评级结果
+                        jczbmap.put(PJJG, wttragetreportmain3.getPjjg());
+                        //月发电量
+                        jczbmap.put("yfdl", wttragetreportmain3.getYfdl());
+                        //年发电量
+                        jczbmap.put("nfdl", wttragetreportmain3.getNfdl());
+                        //月发电量环比
+                        jczbmap.put("yfdlhb", wttragetreportmain3.getYfdlhb());
+                        //年发电量同比
+                        jczbmap.put("yfdltb", wttragetreportmain3.getYfdltb());
+                        //月故障次数
+                        jczbmap.put("ygzcs", wttragetreportmain3.getYgzcs());
+                        //月故障时长
+                        jczbmap.put("ygzsc", wttragetreportmain3.getYgzsc());
+                        //发电机故障次数
+                        jczbmap.put("fdlgzcs", wttragetreportmain3.getFdlgzcs());
+                        //发电机报警次数
+                        jczbmap.put("fdlbjcs", wttragetreportmain3.getFdlbjcs());
+                        //发电机健康情况
+                        jczbmap.put("fdljkqk", wttragetreportmain3.getFdljkqk());
+                        //齿轮箱故障次数
+                        jczbmap.put("clxgzcs", wttragetreportmain3.getClxgzcs());
+                        //齿轮箱报警次数
+                        jczbmap.put("clxbjcs", wttragetreportmain3.getClxbjcs());
+                        //齿轮箱健康情况
+                        jczbmap.put("clxjkqk", wttragetreportmain3.getClxjkqk());
+                        //变浆故障次数
+                        jczbmap.put("bjgzcs", wttragetreportmain3.getBjgzcs());
+                        //变浆报警次数
+                        jczbmap.put("bjbjcs", wttragetreportmain3.getBjbjcs());
+                        //变浆健康情况
+                        jczbmap.put("bjjkqk", wttragetreportmain3.getBjjkqk());
+                        //主控故障次数
+                        jczbmap.put("zkgzcs", wttragetreportmain3.getZkgzcs());
+                        //主控报警次数
+                        jczbmap.put("zkbjcs", wttragetreportmain3.getZkbjcs());
+                        //主控健康情况
+                        jczbmap.put("zkjkqk", wttragetreportmain3.getZkjkqk());
+
+
+                        //理论发电量
+                        jczbmap.put("llfdl", wttragetreportmain3.getLlfdl());
+                        //平均功率
+                        jczbmap.put("pjgl", wttragetreportmain3.getPjgl());
+                        //故障损失电量
+                        jczbmap.put("gzssdl", wttragetreportmain3.getGzssdl());
+                        //限电损失电量
+                        jczbmap.put("xdssdll", wttragetreportmain3.getXdssdll());
+                        //维护损失电量
+                        jczbmap.put("whssdl", wttragetreportmain3.getWhssdl());
+                        //性能损失电量
+                        jczbmap.put("xnssdl", wttragetreportmain3.getXnssdl());
+                        //受累损失电量
+                        jczbmap.put("slssdl", 0.0);
+                        //故障时间
+                        jczbmap.put("gzsj", wttragetreportmain3.getGzsj());
+                        //维护时间
+                        jczbmap.put("whsj", wttragetreportmain3.getWhsj());
+                        //运行时间
+                        jczbmap.put("yxsj", wttragetreportmain3.getYxsj());
+                        //停机时间
+                        jczbmap.put("tjsj", wttragetreportmain3.getTjsj());
+                        //平均切入风速
+                        jczbmap.put("pjqrfs", wttragetreportmain3.getPjqrfs());
+
+                        //拟合优度
+                        jczbmap.put("nhyd", wttragetreportmain3.getNhyd());
+                        //功率一致性系数
+                        jczbmap.put("glyzxxs", wttragetreportmain3.getGlyzxxs());
+                        //利用小时
+                        jczbmap.put("lyxs", wttragetreportmain3.getLyxs());
+                        //设备利用率
+                        jczbmap.put("sbklyl", wttragetreportmain3.getSbklyl());
+                        //等效可利用系数
+                        jczbmap.put("dxklyxs", wttragetreportmain3.getDxklyxs());
+                        //有效风时速
+                        jczbmap.put("yxfss", wttragetreportmain3.getYxfss());
+                        //平均风速
+                        jczbmap.put("pjfs", wttragetreportmain3.getPjfs());
+
+                        //静风频率
+                        jczbmap.put("jfpl", wttragetreportmain3.getJfpl());
+                        //并网时间
+                        jczbmap.put("bwsj", wttragetreportmain3.getBwsj());
+
+                    }
+
+                    //获得检修数据
+                    List<WtReportFault3> wtfaultls = wtReportFault3Service.findWtReportFault3(wtreport.getId(), wtId);
+
+                    if (!wtfaultls.isEmpty()) {
+                        WtReportFault3 wtReportFault3 = wtfaultls.get(0);
+
+                        if (StringUtils.notEmp(wtReportFault3.getMainreason())) {
+                            if (jczbmap.containsKey(PJJG)) {
+                                String pjjg = (String) jczbmap.get(PJJG);
+                                if (!pjjg.equals("差!")) {
+                                    jczbmap.put(PJJG, "差!");
+                                }
+                                jczbmap.put(PJDJ, "C-");
+                            }
+                        } else {
+                            if (jczbmap.containsKey(PJJG)) {
+                                String pjjg = (String) jczbmap.get(PJJG);
+                                if (pjjg.equals("差!")) {
+                                    jczbmap.put(PJJG, "良!");
+                                }
+                                jczbmap.put(PJDJ, "B");
+                            }
+                        }
+
+
+                        //健康情况说明
+                        jczbmap.put("jkqksm", wtReportFault3.getGztop3name());
+                        //故障类型1
+                        if (!wtReportFault3.getTop1type().equals("null")) {
+                            jczbmap.put("top1type", wtReportFault3.getTop1type());
+                        } else {
+                            jczbmap.put("top1type", null);
+                        }
+                        //故障类型2
+                        if (!wtReportFault3.getTop2type().equals("null")) {
+                            jczbmap.put("top2type", wtReportFault3.getTop2type());
+                        } else {
+                            jczbmap.put("top2type", null);
+                        }
+                        //故障类型3
+                        if (!wtReportFault3.getTop3type().equals("null")) {
+                            jczbmap.put("top3type", wtReportFault3.getTop3type());
+                        } else {
+                            jczbmap.put("top3type", null);
+                        }
+
+
+                        //推荐理由
+                        jczbmap.put("jxly", wtReportFault3.getMainreason());
+                        //检修时间
+                        jczbmap.put("jxsj", wtReportFault3.getMaindate());
+                        //风速
+                        jczbmap.put("jxfs", wtReportFault3.getSpeed());
+                        //检修方法
+                        jczbmap.put("jxff", wtReportFault3.getMainmethod());
+                        //检查步骤
+                        jczbmap.put("jxbz", wtReportFault3.getApproach());
+                        //检修工具
+                        jczbmap.put("jxgj", wtReportFault3.getTools());
+                        //检修平均时间
+                        jczbmap.put("jxsc", wtReportFault3.getMainhour());
+
+                    }
+
+                    map.put("jczbmap",jczbmap);
+                    /*******************************基础指标****************************************/
+
+					/**************************风机四大部件图表指标***********************************/
+					Map<String,List<Wttragetreportchart3>> chartmap=new HashMap<>();
+					//获得风机四大部件图表列表
+					List<Wttragetreportchart3>  wtchartls = wttragetreportchart3Service.findWttragetreportchart3(wtreport.getId(), wtId);
+
+					if(!wtchartls.isEmpty())
+					{
+						for(Wttragetreportchart3 chart:wtchartls)
+						{
+							if(StringUtils.notEmp(chart.getPartid()))
+							{
+								if(chartmap.containsKey(chart.getPartid()))
+								{
+									List<Wttragetreportchart3> ls=chartmap.get(chart.getPartid());
+									ls.add(chart);
+									chartmap.put(chart.getPartid(),ls);
+								}else
+								{
+									List<Wttragetreportchart3> ls=new ArrayList<>();
+									ls.add(chart);
+									chartmap.put(chart.getPartid(),ls);
+								}
+							}
+						}
+					}
+					map.put("chartmap",chartmap);
+					/**************************风机四大部件图表指标***********************************/
+
+					/**************************风能利用率指标***********************************/
+
+					//获得风能利用率列表
+					List<Wttragetreportfnlyl3>  wtfnlylls = wttragetreportfnlyl3Service.findWttragetreportfnlyl3(wtreport.getId(), wtId);
+
+					map.put("fnlyl",wtfnlylls);
+					/**************************风风能利用率指标***********************************/
+
+					/**************************可靠性分析指标***********************************/
+
+					//获得可靠性分析列表
+					List<Wttragetreportkkxfx3>  wtkkxfxls = wttragetreportkkxfx3Service.findWttragetreportkkxfx3(wtreport.getId(), wtId);
+
+					map.put("kkxfx",wtkkxfxls);
+					/**************************可靠性分析指标***********************************/
+
+					/**************************风机部件指标指标***********************************/
+
+					//获得风机部件指标列表
+					List<Wttragetreportpart3>  wtbjzbls = wttragetreportpart3Service.findWttragetreportpart3(wtreport.getId(), wtId);
+
+					map.put("bjzb",wtbjzbls);
+					/**************************风机部件指标指标***********************************/
+
+					/**************************等级评估指标***********************************/
+
+					//获得风机等级评估指标列表
+					List<Wttragetreportxndjpj3>  wtdjpgzbls = wttragetreportxndjpj3Service.findWttragetreportxndjpj3(wtreport.getId(), wtId);
+
+					map.put("djpg",wtdjpgzbls);
+					/**************************等级评估指标***********************************/
+				}
+            }
+
+        }
+
+
+        return map;
+
+    }
+}

+ 124 - 0
src/main/java/com/gyee/frame/service/report/WtReportFault3Service.java

@@ -0,0 +1,124 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WtReportFault3Mapper;
+import com.gyee.frame.model.auto.WtReportFault3;
+import com.gyee.frame.model.auto.WtReportFault3Example;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 WtReportFault3Service
+ * @Title: WtReportFault3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WtReportFault3Service implements BaseService<WtReportFault3, WtReportFault3Example> {
+	@Resource
+	private WtReportFault3Mapper wtReportFault3Mapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			WtReportFault3Example example=new WtReportFault3Example();
+			example.createCriteria().andIdIn(lista);
+			return wtReportFault3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public WtReportFault3 selectByPrimaryKey(String id) {
+				
+			return wtReportFault3Mapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(WtReportFault3 record) {
+		return wtReportFault3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(WtReportFault3 record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return wtReportFault3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(WtReportFault3 record, WtReportFault3Example example) {
+		
+		return wtReportFault3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(WtReportFault3 record, WtReportFault3Example example) {
+		
+		return wtReportFault3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<WtReportFault3> selectByExample(WtReportFault3Example example) {
+		
+		return wtReportFault3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WtReportFault3Example example) {
+		
+		return wtReportFault3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WtReportFault3Example example) {
+		
+		return wtReportFault3Mapper.deleteByExample(example);
+	}
+
+	public List<WtReportFault3> findWtReportFault3(Integer tid,String wtId) {
+
+
+		List<WtReportFault3> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			WtReportFault3Example example=new WtReportFault3Example();
+			example.setOrderByClause("recodedate asc");
+
+			WtReportFault3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wtReportFault3Mapper.selectByExample(example);
+		}
+
+		return list;
+
+	}
+
+}

+ 124 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreport3Service.java

@@ -0,0 +1,124 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreport3Mapper;
+import com.gyee.frame.model.auto.Wttragetreport3;
+import com.gyee.frame.model.auto.Wttragetreport3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreport3Service
+ * @Title: Wttragetreport3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreport3Service implements BaseService<Wttragetreport3, Wttragetreport3Example> {
+	@Resource
+	private Wttragetreport3Mapper wttragetreport3Mapper;
+	
+   
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreport3Example example=new Wttragetreport3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreport3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreport3 selectByPrimaryKey(String id) {
+				
+			return wttragetreport3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreport3 record) {
+		return wttragetreport3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreport3 record) {
+				
+
+				
+		return wttragetreport3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreport3 record, Wttragetreport3Example example) {
+		
+		return wttragetreport3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreport3 record, Wttragetreport3Example example) {
+		
+		return wttragetreport3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreport3> selectByExample(Wttragetreport3Example example) {
+		
+		return wttragetreport3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreport3Example example) {
+		
+		return wttragetreport3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreport3Example example) {
+		
+		return wttragetreport3Mapper.deleteByExample(example);
+	}
+
+	public List<Wttragetreport3> findWttragetreport3(String wtId, Integer  year,Integer month) {
+
+
+		List<Wttragetreport3> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(wtId) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreport3Example example=new Wttragetreport3Example();
+			example.setOrderByClause("recodedate asc");
+
+			Wttragetreport3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andYearEqualTo(year);
+
+			criteria.andMonthEqualTo(month);
+
+			list= wttragetreport3Mapper.selectByExample(example);
+		}
+
+
+		return list;
+
+	}
+
+}

+ 125 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreportchart3Service.java

@@ -0,0 +1,125 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreportchart3Mapper;
+import com.gyee.frame.model.auto.Wttragetreportchart3;
+import com.gyee.frame.model.auto.Wttragetreportchart3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreportchart3Service
+ * @Title: Wttragetreportchart3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreportchart3Service implements BaseService<Wttragetreportchart3, Wttragetreportchart3Example> {
+	@Resource
+	private Wttragetreportchart3Mapper wttragetreportchart3Mapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreportchart3Example example=new Wttragetreportchart3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreportchart3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreportchart3 selectByPrimaryKey(String id) {
+				
+			return wttragetreportchart3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreportchart3 record) {
+		return wttragetreportchart3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreportchart3 record) {
+				
+
+				
+		return wttragetreportchart3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreportchart3 record, Wttragetreportchart3Example example) {
+		
+		return wttragetreportchart3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreportchart3 record, Wttragetreportchart3Example example) {
+		
+		return wttragetreportchart3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreportchart3> selectByExample(Wttragetreportchart3Example example) {
+		
+		return wttragetreportchart3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreportchart3Example example) {
+		
+		return wttragetreportchart3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreportchart3Example example) {
+		
+		return wttragetreportchart3Mapper.deleteByExample(example);
+	}
+
+	public List<Wttragetreportchart3> findWttragetreportchart3(Integer tid,String wtId) {
+
+
+		List<Wttragetreportchart3> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreportchart3Example example=new Wttragetreportchart3Example();
+			example.setOrderByClause(" partid,recorddate");
+
+			Wttragetreportchart3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wttragetreportchart3Mapper.selectByExample(example);
+		}
+
+
+
+
+
+		return list;
+
+	}
+
+}

+ 125 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreportfnlyl3Service.java

@@ -0,0 +1,125 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreportfnlyl3Mapper;
+import com.gyee.frame.model.auto.Wttragetreportfnlyl3;
+import com.gyee.frame.model.auto.Wttragetreportfnlyl3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreportfnlyl3Service
+ * @Title: Wttragetreportfnlyl3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreportfnlyl3Service implements BaseService<Wttragetreportfnlyl3, Wttragetreportfnlyl3Example> {
+	@Resource
+	private Wttragetreportfnlyl3Mapper wttragetreportfnlyl3Mapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreportfnlyl3Example example=new Wttragetreportfnlyl3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreportfnlyl3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreportfnlyl3 selectByPrimaryKey(String id) {
+				
+			return wttragetreportfnlyl3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreportfnlyl3 record) {
+		return wttragetreportfnlyl3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreportfnlyl3 record) {
+				
+
+			
+				
+		return wttragetreportfnlyl3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreportfnlyl3 record, Wttragetreportfnlyl3Example example) {
+		
+		return wttragetreportfnlyl3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreportfnlyl3 record, Wttragetreportfnlyl3Example example) {
+		
+		return wttragetreportfnlyl3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreportfnlyl3> selectByExample(Wttragetreportfnlyl3Example example) {
+		
+		return wttragetreportfnlyl3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreportfnlyl3Example example) {
+		
+		return wttragetreportfnlyl3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreportfnlyl3Example example) {
+		
+		return wttragetreportfnlyl3Mapper.deleteByExample(example);
+	}
+
+
+	public List<Wttragetreportfnlyl3> findWttragetreportfnlyl3(Integer tid,String wtId) {
+
+
+		List<Wttragetreportfnlyl3> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreportfnlyl3Example example=new Wttragetreportfnlyl3Example();
+			example.setOrderByClause("recorddate asc");
+
+			Wttragetreportfnlyl3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wttragetreportfnlyl3Mapper.selectByExample(example);
+		}
+
+
+
+
+		return list;
+
+	}
+}

+ 121 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreportkkxfx3Service.java

@@ -0,0 +1,121 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreportkkxfx3Mapper;
+import com.gyee.frame.model.auto.Wttragetreportkkxfx3;
+import com.gyee.frame.model.auto.Wttragetreportkkxfx3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreportkkxfx3Service
+ * @Title: Wttragetreportkkxfx3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreportkkxfx3Service implements BaseService<Wttragetreportkkxfx3, Wttragetreportkkxfx3Example> {
+	@Resource
+	private Wttragetreportkkxfx3Mapper wttragetreportkkxfx3Mapper;
+	
+   
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreportkkxfx3Example example=new Wttragetreportkkxfx3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreportkkxfx3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreportkkxfx3 selectByPrimaryKey(String id) {
+				
+			return wttragetreportkkxfx3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreportkkxfx3 record) {
+		return wttragetreportkkxfx3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreportkkxfx3 record) {
+				
+		
+				
+		return wttragetreportkkxfx3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreportkkxfx3 record, Wttragetreportkkxfx3Example example) {
+		
+		return wttragetreportkkxfx3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreportkkxfx3 record, Wttragetreportkkxfx3Example example) {
+		
+		return wttragetreportkkxfx3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreportkkxfx3> selectByExample(Wttragetreportkkxfx3Example example) {
+		
+		return wttragetreportkkxfx3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreportkkxfx3Example example) {
+		
+		return wttragetreportkkxfx3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreportkkxfx3Example example) {
+		
+		return wttragetreportkkxfx3Mapper.deleteByExample(example);
+	}
+
+	public List<Wttragetreportkkxfx3> findWttragetreportkkxfx3(Integer tid,String wtId) {
+
+
+		List<Wttragetreportkkxfx3> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreportkkxfx3Example example=new Wttragetreportkkxfx3Example();
+			example.setOrderByClause("recorddate asc");
+
+			Wttragetreportkkxfx3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wttragetreportkkxfx3Mapper.selectByExample(example);
+		}
+
+		return list;
+
+	}
+
+}

+ 122 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreportmain3Service.java

@@ -0,0 +1,122 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreportmain3Mapper;
+import com.gyee.frame.model.auto.Wttragetreportmain3;
+import com.gyee.frame.model.auto.Wttragetreportmain3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreportmain3Service
+ * @Title: Wttragetreportmain3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreportmain3Service implements BaseService<Wttragetreportmain3, Wttragetreportmain3Example> {
+	@Resource
+	private Wttragetreportmain3Mapper wttragetreportmain3Mapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreportmain3Example example=new Wttragetreportmain3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreportmain3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreportmain3 selectByPrimaryKey(String id) {
+				
+			return wttragetreportmain3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreportmain3 record) {
+		return wttragetreportmain3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreportmain3 record) {
+				
+
+			
+				
+		return wttragetreportmain3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreportmain3 record, Wttragetreportmain3Example example) {
+		
+		return wttragetreportmain3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreportmain3 record, Wttragetreportmain3Example example) {
+		
+		return wttragetreportmain3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreportmain3> selectByExample(Wttragetreportmain3Example example) {
+		
+		return wttragetreportmain3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreportmain3Example example) {
+		
+		return wttragetreportmain3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreportmain3Example example) {
+		
+		return wttragetreportmain3Mapper.deleteByExample(example);
+	}
+
+	public List<Wttragetreportmain3> findWttragetreportmain3(Integer tid,String wtId) {
+
+
+		List<Wttragetreportmain3> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreportmain3Example example=new Wttragetreportmain3Example();
+			example.setOrderByClause("recodedate asc");
+
+			Wttragetreportmain3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wttragetreportmain3Mapper.selectByExample(example);
+		}
+
+		return list;
+
+	}
+
+}

+ 124 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreportpart3Service.java

@@ -0,0 +1,124 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreportpart3Mapper;
+import com.gyee.frame.model.auto.Wttragetreportpart3;
+import com.gyee.frame.model.auto.Wttragetreportpart3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreportpart3Service
+ * @Title: Wttragetreportpart3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreportpart3Service implements BaseService<Wttragetreportpart3, Wttragetreportpart3Example> {
+	@Resource
+	private Wttragetreportpart3Mapper wttragetreportpart3Mapper;
+	
+   
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreportpart3Example example=new Wttragetreportpart3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreportpart3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreportpart3 selectByPrimaryKey(String id) {
+				
+			return wttragetreportpart3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreportpart3 record) {
+		return wttragetreportpart3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreportpart3 record) {
+				
+		
+				
+		return wttragetreportpart3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreportpart3 record, Wttragetreportpart3Example example) {
+		
+		return wttragetreportpart3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreportpart3 record, Wttragetreportpart3Example example) {
+		
+		return wttragetreportpart3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreportpart3> selectByExample(Wttragetreportpart3Example example) {
+		
+		return wttragetreportpart3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreportpart3Example example) {
+		
+		return wttragetreportpart3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreportpart3Example example) {
+		
+		return wttragetreportpart3Mapper.deleteByExample(example);
+	}
+
+	public List<Wttragetreportpart3> findWttragetreportpart3(Integer tid,String wtId) {
+
+
+		List<Wttragetreportpart3> list=new ArrayList<>();
+
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreportpart3Example example=new Wttragetreportpart3Example();
+			example.setOrderByClause("recorddate asc");
+
+			Wttragetreportpart3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wttragetreportpart3Mapper.selectByExample(example);
+		}
+
+
+
+		return list;
+
+	}
+
+}

+ 123 - 0
src/main/java/com/gyee/frame/service/report/Wttragetreportxndjpj3Service.java

@@ -0,0 +1,123 @@
+package com.gyee.frame.service.report;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Wttragetreportxndjpj3Mapper;
+import com.gyee.frame.model.auto.Wttragetreportxndjpj3;
+import com.gyee.frame.model.auto.Wttragetreportxndjpj3Example;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 Wttragetreportxndjpj3Service
+ * @Title: Wttragetreportxndjpj3Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class Wttragetreportxndjpj3Service implements BaseService<Wttragetreportxndjpj3, Wttragetreportxndjpj3Example> {
+	@Resource
+	private Wttragetreportxndjpj3Mapper wttragetreportxndjpj3Mapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			Wttragetreportxndjpj3Example example=new Wttragetreportxndjpj3Example();
+			example.createCriteria().andIdIn(lista);
+			return wttragetreportxndjpj3Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Wttragetreportxndjpj3 selectByPrimaryKey(String id) {
+				
+			return wttragetreportxndjpj3Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Wttragetreportxndjpj3 record) {
+		return wttragetreportxndjpj3Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Wttragetreportxndjpj3 record) {
+				
+
+			
+				
+		return wttragetreportxndjpj3Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Wttragetreportxndjpj3 record, Wttragetreportxndjpj3Example example) {
+		
+		return wttragetreportxndjpj3Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Wttragetreportxndjpj3 record, Wttragetreportxndjpj3Example example) {
+		
+		return wttragetreportxndjpj3Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Wttragetreportxndjpj3> selectByExample(Wttragetreportxndjpj3Example example) {
+		
+		return wttragetreportxndjpj3Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Wttragetreportxndjpj3Example example) {
+		
+		return wttragetreportxndjpj3Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Wttragetreportxndjpj3Example example) {
+		
+		return wttragetreportxndjpj3Mapper.deleteByExample(example);
+	}
+
+
+	public List<Wttragetreportxndjpj3> findWttragetreportxndjpj3(Integer tid,String wtId) {
+
+
+		List<Wttragetreportxndjpj3> list=new ArrayList<>();
+
+
+		if(StringUtils.notEmp(tid) && StringUtils.notEmp(wtId))
+		{
+			Wttragetreportxndjpj3Example example=new Wttragetreportxndjpj3Example();
+			example.setOrderByClause("recorddate asc");
+
+			Wttragetreportxndjpj3Example.Criteria criteria =example.createCriteria();
+
+			criteria.andTidEqualTo(tid);
+			criteria.andWtidEqualTo(wtId);
+			list= wttragetreportxndjpj3Mapper.selectByExample(example);
+		}
+
+		return list;
+
+	}
+}

+ 121 - 59
src/main/java/com/gyee/frame/service/websocket/AgcService.java

@@ -6,6 +6,7 @@ import com.gyee.frame.model.agc.AgcVo;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.service.WindPowerstationTestingPointService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.MathUtil;
@@ -13,6 +14,7 @@ import com.gyee.frame.util.StringUtils;
 import com.gyee.frame.util.golden.EdosUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -25,9 +27,11 @@ import java.util.*;
  */
 @Service
 public class AgcService {
-    private IRealTimeDataBaseUtil ednaApiUtil = new EdosUtil();
-
 
+    private IRealTimeDataBaseUtil ednaApiUtil = new EdosUtil();
+    @Resource
+    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    String[] ycPoints1 = Constant.TPOINT_WP_FGLYC.split(",");
 
     public List<Map<String, Object>> getAgcValues() throws Exception {
         List<Map<String, Object>> vos=new ArrayList<>();
@@ -61,12 +65,12 @@ public class AgcService {
                 Map<String, Object> tempmap=new HashMap<>();
                 if(objmap.containsKey("QS_FDC02"))
                 {
-                    tempmap.put("jcxx",objmap.get(wp.getId()));
+                    tempmap.put("jcxx",objmap.get("QS_FDC02"));
                 }
 
                 if(linemap.containsKey("QS_FDC02"))
                 {
-                    tempmap.put("tb",linemap.get(wp.getId()));
+                    tempmap.put("tb",linemap.get("QS_FDC02"));
                 }
 
                 vos.add(tempmap);
@@ -75,12 +79,12 @@ public class AgcService {
                 Map<String, Object> tempmap=new HashMap<>();
                 if(objmap.containsKey("SBQ_FDC02"))
                 {
-                    tempmap.put("jcxx",objmap.get(wp.getId()));
+                    tempmap.put("jcxx",objmap.get("SBQ_FDC02"));
                 }
 
                 if(linemap.containsKey("SBQ_FDC02"))
                 {
-                    tempmap.put("tb",linemap.get(wp.getId()));
+                    tempmap.put("tb",linemap.get("SBQ_FDC02"));
                 }
 
                 vos.add(tempmap);
@@ -104,7 +108,7 @@ public class AgcService {
             if (wp.getId().equals("MCH_GDC")) {
                 continue;
             }
-            Map<String, Double> resultmap = new HashMap<String, Double>();
+            Map<String, Object> resultmap = new HashMap<String, Object>();
             String[] agcPoints = Constant.TPOINT_WP_AGC;
 
             Map<String, WindPowerStationTestingPoint2> map = InitialRunner.wpPointmap.get(wp.getId());
@@ -118,10 +122,20 @@ public class AgcService {
                         try {
                             data = ednaApiUtil.getRealData(ai);
                             if (data != null) {
-                                resultmap.put(wp.getId() + "_" + agcPoints[i],
-                                        MathUtil.decimal(data.getPointValueInDouble(), 2));
+
+                                if(i==0)
+                                {
+                                    double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).doubleValue();
+                                    resultmap.put( agcPoints[i],llgl);
+                                }else
+                                {
+                                    resultmap.put( agcPoints[i],
+                                            MathUtil.decimal(data.getPointValueInDouble(), 2));
+                                }
+
+
                             }else{
-                                resultmap.put(wp.getId() + "_" + agcPoints[i],0.0);
+                                resultmap.put(agcPoints[i],0.0);
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -131,10 +145,31 @@ public class AgcService {
 
             }
 
+            PointData data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]));
+            resultmap.put("ycgl",MathUtil.decimal(data.getPointValueInDouble(), 2));
+            data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT));
+            double zt=data.getPointValueInDouble();
+            if(zt==5)
+            {
+                resultmap.put("zt",0);
+            }else
+            {
+                resultmap.put("zt",1);
+            }
+
+            resultmap.put("name",wp.getName());
+
+            if(wp.getId().equals("SBQ_FDC"))
+            {
+                resultmap.put("ddmc","星能风电场");
+            }else{
+                resultmap.put("ddmc",wp.getName());
+            }
+
             objmap.put(wp.getId(),resultmap);
             if (wp.getId().equals("SBQ_FDC")){
 
-                Map<String, Double> tempmap = new HashMap<String, Double>();
+                Map<String, Object> tempmap = new HashMap<String, Object>();
                 /*牛五*/
                 double nwllgl = ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P2_XXX_XXX_CI0192").getPointValueInDouble()
                         +ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P3_XXX_XXX_CI0192").getPointValueInDouble()
@@ -150,25 +185,39 @@ public class AgcService {
                 double nwzzttzt = ednaApiUtil.getRealData("SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI2253").getPointValueInDouble();
                 double xlllgl = ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P1_XXX_XXX_CI0192").getPointValueInDouble();
 
-                Map<String, Double> tempmap2=(Map<String, Double>)objmap.get(wp.getId());
-                tempmap2.put("SBQ_FDC_LLGL", MathUtil.decimal(xlllgl/1000,2));
-
-                tempmap.put("SBQ_FDC02_LLGL", MathUtil.decimal(nwllgl,2));
-                tempmap.put("SBQ_FDC02_AGC001", MathUtil.decimal(nwcxgl,2));
-                tempmap.put("SBQ_FDC02_AGC002", MathUtil.decimal(nwxdzl,2));
-                tempmap.put("SBQ_FDC02_AGC003", MathUtil.decimal(nwygsx,2));
-                tempmap.put("SBQ_FDC02_AGC004", MathUtil.decimal(nwygxx,2));
-                tempmap.put("SBQ_FDC02_AGC005", MathUtil.decimal(nwyf,2));
-                tempmap.put("SBQ_FDC02_AGC006", MathUtil.decimal(nwtt,2));
-                tempmap.put("SBQ_FDC02_AGC007", MathUtil.decimal(nwjbs,2));
-                tempmap.put("SBQ_FDC02_AGC008", MathUtil.decimal(nwzbs,2));
-                tempmap.put("SBQ_FDC02_AVC005", MathUtil.decimal(nwzzttzt,2));
-
-
+                double sjgl = ednaApiUtil.getRealData("SBQFCJSFW.NX_GD_SBQF_FJ_P4_XXX_XXX_CI0134").getPointValueInDouble();
+                Map<String, Object> tempmap2=(Map<String, Object>)objmap.get(wp.getId());
+                tempmap2.put("ZZSGL", MathUtil.decimal(xlllgl/1000,2));
+
+                tempmap.put("SSZGL", MathUtil.decimal(sjgl,2));
+                tempmap.put("ZZSGL", MathUtil.decimal(nwllgl,2));
+                tempmap.put("AGC001", MathUtil.decimal(nwcxgl,2));
+                tempmap.put("AGC002", MathUtil.decimal(nwxdzl,2));
+                tempmap.put("AGC003", MathUtil.decimal(nwygsx,2));
+                tempmap.put("AGC004", MathUtil.decimal(nwygxx,2));
+                tempmap.put("AGC005", MathUtil.decimal(nwyf,2));
+                tempmap.put("AGC006", MathUtil.decimal(nwtt,2));
+                tempmap.put("AGC007", MathUtil.decimal(nwjbs,2));
+                tempmap.put("AGC008", MathUtil.decimal(nwzbs,2));
+                tempmap.put("AVC005", MathUtil.decimal(nwzzttzt,2));
+
+                tempmap.put("ycgl",0.0);
+                tempmap.put("name",wp.getName());
+                tempmap.put("ddmc","牛五风电场");
+
+                data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2("SBQ04_GC", Constant.FJZT));
+                zt=data.getPointValueInDouble();
+                if(zt==5)
+                {
+                    tempmap.put("zt",0);
+                }else
+                {
+                    tempmap.put("zt",1);
+                }
                 objmap.put("SBQ_FDC02",tempmap);
             }else if(wp.getId().equals("QS_FDC")){
                 /*宋六*/
-                Map<String, Double> tempmap = new HashMap<String, Double>();
+                Map<String, Object> tempmap = new HashMap<String, Object>();
                 double slllgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0192").getPointValueInDouble();
                 double slcxgl = ednaApiUtil.getRealData("SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013").getPointValueInDouble()/1000;
                 double slxdzl = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0052").getPointValueInDouble();
@@ -179,40 +228,53 @@ public class AgcService {
                 double sljbs =ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0163").getPointValueInDouble();
                 double slzbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0162").getPointValueInDouble();
 
-                double mxdysj = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0025").getPointValueInDouble();
-                double mxdytk = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0026").getPointValueInDouble();
-                double mxkjwg = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0022").getPointValueInDouble();
+//                double mxdysj = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0025").getPointValueInDouble();
+//                double mxdytk = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0026").getPointValueInDouble();
+//                double mxkjwg = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0022").getPointValueInDouble();
                 double qsllgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P1_XXX_XXX_CI0192").getPointValueInDouble()
                         + ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P2_XXX_XXX_CI0192").getPointValueInDouble();
-                double mxkzwg = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0021").getPointValueInDouble();
-                double zztt = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0170").getPointValueInDouble();
-                double zzyx = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0171") .getPointValueInDouble();
-                double jwgbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0133").getPointValueInDouble();
-                double zwgbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0114").getPointValueInDouble();
-
-                Map<String, Double> tempmap2=(Map<String, Double>)objmap.get(wp.getId());
-                tempmap2.put("QS_FDC_LLGL", MathUtil.decimal(qsllgl / 1000, 2));
-
-
-                tempmap.put("QS_FDC02_LLGL", MathUtil.decimal(slllgl, 2));
-                tempmap.put("QS_FDC02_AGC001", MathUtil.decimal(slcxgl, 2));
-                tempmap.put("QS_FDC02_AGC002", MathUtil.decimal(slxdzl, 2));
-                tempmap.put("QS_FDC02_AGC003", MathUtil.decimal(slygsx, 2));
-                tempmap.put("QS_FDC02_AGC004", MathUtil.decimal(slygxx, 2));
-                tempmap.put("QS_FDC02_AGC005", MathUtil.decimal(slyf, 2));
-                tempmap.put("QS_FDC02_AGC006", MathUtil.decimal(sltt, 2));
-                tempmap.put("QS_FDC02_AGC007", MathUtil.decimal(sljbs, 2));
-                tempmap.put("QS_FDC02_AGC008", MathUtil.decimal(slzbs, 2));
-
-                tempmap.put("QS_FDC02_AVC001", MathUtil.decimal(mxdysj, 2));
-                tempmap.put("QS_FDC02_AVC002", MathUtil.decimal(mxdytk, 2));
-                tempmap.put("QS_FDC02_AVC003", MathUtil.decimal(mxkjwg, 2));
-                tempmap.put("QS_FDC02_AVC004", MathUtil.decimal(mxkzwg, 2));
-                tempmap.put("QS_FDC02_AVC005", MathUtil.decimal(zztt, 2));
-                tempmap.put("QS_FDC02_AVC006", MathUtil.decimal(zzyx, 2));
-                tempmap.put("QS_FDC02_AVC007", MathUtil.decimal(jwgbs, 2));
-                tempmap.put("QS_FDC02_AVC008", MathUtil.decimal(zwgbs, 2));
-
+//                double mxkzwg = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0021").getPointValueInDouble();
+//                double zztt = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0170").getPointValueInDouble();
+//                double zzyx = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0171") .getPointValueInDouble();
+//                double jwgbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0133").getPointValueInDouble();
+//                double zwgbs = ednaApiUtil.getRealData("SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0114").getPointValueInDouble();
+
+                Map<String, Object> tempmap2=(Map<String, Object>)objmap.get(wp.getId());
+                tempmap2.put("ZZSGL", MathUtil.decimal(qsllgl / 1000, 2));
+
+                double sjgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0134").getPointValueInDouble();
+                tempmap.put("SSZGL", MathUtil.decimal(sjgl,2));
+
+                tempmap.put("ZZSGL", MathUtil.decimal(slllgl, 2));
+                tempmap.put("AGC001", MathUtil.decimal(slcxgl, 2));
+                tempmap.put("AGC002", MathUtil.decimal(slxdzl, 2));
+                tempmap.put("AGC003", MathUtil.decimal(slygsx, 2));
+                tempmap.put("AGC004", MathUtil.decimal(slygxx, 2));
+                tempmap.put("AGC005", MathUtil.decimal(slyf, 2));
+                tempmap.put("AGC006", MathUtil.decimal(sltt, 2));
+                tempmap.put("AGC007", MathUtil.decimal(sljbs, 2));
+                tempmap.put("AGC008", MathUtil.decimal(slzbs, 2));
+
+//                tempmap.put("QS_FDC02_AVC001", MathUtil.decimal(mxdysj, 2));
+//                tempmap.put("QS_FDC02_AVC002", MathUtil.decimal(mxdytk, 2));
+//                tempmap.put("QS_FDC02_AVC003", MathUtil.decimal(mxkjwg, 2));
+//                tempmap.put("QS_FDC02_AVC004", MathUtil.decimal(mxkzwg, 2));
+//                tempmap.put("QS_FDC02_AVC005", MathUtil.decimal(zztt, 2));
+//                tempmap.put("QS_FDC02_AVC006", MathUtil.decimal(zzyx, 2));
+//                tempmap.put("QS_FDC02_AVC007", MathUtil.decimal(jwgbs, 2));
+//                tempmap.put("QS_FDC02_AVC008", MathUtil.decimal(zwgbs, 2));
+                tempmap.put("ycgl",0.0);
+                tempmap.put("name",wp.getName());
+                tempmap.put("ddmc","宋六风电场");
+                data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2("QS03_GC", Constant.FJZT));
+                zt=data.getPointValueInDouble();
+                if(zt==5)
+                {
+                    tempmap.put("zt",0);
+                }else
+                {
+                    tempmap.put("zt",1);
+                }
                 objmap.put("QS_FDC02",tempmap);
 
             }

+ 28 - 1
src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -8,6 +8,7 @@ import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
+import com.gyee.frame.service.ShutdowneventService;
 import com.gyee.frame.service.WindPowerstationTestingPointService;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.DateUtils;
@@ -35,7 +36,8 @@ public class GenreSetPushService {
     private ProjectPlanService projectPlanService;
     @Resource
     private RealPowerPushService realPowerPushService;
-
+    @Resource
+    private ShutdowneventService shutdowneventService;
 
     private final String QS = "0";
     private final String FD = "-1";
@@ -96,6 +98,29 @@ public class GenreSetPushService {
 
             }
 
+
+
+
+            if (id.equals("0")) {
+
+                double jpeyht = realApiUtil.getRealData(ConstantTR.JPEYHT).getPointValueInDouble();// 减排二氧化碳
+                // EDOS.CALC.GSJPEYHT
+                double jybm = realApiUtil.getRealData(ConstantTR.JYBM).getPointValueInDouble();// 节约标煤
+
+                double jpeyhl = realApiUtil.getRealData(ConstantTR.JPEYHL).getPointValueInDouble();// 减排二氧化硫
+                // EDOS.CALC.GSJPEYHL
+                double jys = realApiUtil.getRealData(ConstantTR.JYS).getPointValueInDouble();// 节约水
+
+                double aqts = realApiUtil.getRealData(ConstantTR.AQTS).getPointValueInDouble();// 安全天数
+
+                map.put("aqts", StringUtils.round(aqts, 2));
+                map.put("jpeyht", StringUtils.round(jpeyht, 2));
+                map.put("jybm", StringUtils.round(jybm, 2));
+                map.put("jpeyhl", StringUtils.round(jpeyhl, 2));
+                map.put("jys", StringUtils.round(jys, 2));
+
+            }
+
             for (Windpowerstation wp : wplist) {
 
                 zjrl += wp.getCapacity();
@@ -139,6 +164,8 @@ public class GenreSetPushService {
 
                 zjrl = wp.getCapacity();
                 zjts = Double.valueOf(wp.getQuantity());
+
+
             } else if (InitialRunner.pjmap.containsKey(id)) {
                 Project pj = InitialRunner.pjmap.get(id);
 

+ 626 - 16
src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java

@@ -3,6 +3,9 @@ package com.gyee.frame.service.websocket;
 
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.Equipmentmodel;
+import com.gyee.frame.model.auto.Windpowerinfoday;
+import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
@@ -10,6 +13,7 @@ import com.gyee.frame.service.ProjectPlanService;
 import com.gyee.frame.service.WindPowerstationTestingPointService;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindpowerinfodayService;
+import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.MathUtil;
 import com.gyee.frame.util.StringUtils;
@@ -19,10 +23,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class MatrixPushByWpService {
@@ -42,15 +43,38 @@ public class MatrixPushByWpService {
     IRealTimeDataBaseUtil realApiUtil = new EdosUtil();
 
 
-    public Map<String, Object> genreSetMap() throws Exception {
+    public Map<String, Object> findMatrixById(String wpId) throws Exception {
+        Map<String, Object> map =new HashMap<>();
+        if(StringUtils.notEmp(wpId))
+        {
+            return  findMatrix(wpId);
+        }
 
-        Map<String, Object> map = findMatrix("MHS_FDC");
 
 
         return map;
 
     }
 
+    public Map<String, Object> findSimpleMatrixById(String wpId) throws Exception {
+        Map<String, Object> map =new HashMap<>();
+        if(StringUtils.notEmp(wpId))
+        {
+            return  findSimpleMatrix(wpId);
+        }
+
+
+
+        return map;
+
+    }
+
+    /**
+     * 风场矩阵
+     * @param wpId
+     * @return
+     * @throws Exception
+     */
     private Map<String, Object> findMatrix(String wpId) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
@@ -75,7 +99,8 @@ public class MatrixPushByWpService {
             int gfxdnum = 0;
             String[] ycPoints1 = Constant.TPOINT_WP_FGLYC.split(",");
 
-            Map<String, Map<String, MatrixVo>> fjmap = new HashMap<>();
+            //        Map<String, List<MatrixVo>> fjmap = new HashMap<>();
+            List< List<MatrixVo>> fjvos=new ArrayList<>();
             Map<String, Map<String, Object>> fczbmap = new HashMap<>();
 
 
@@ -84,6 +109,8 @@ public class MatrixPushByWpService {
             {
                 Map<String, Object> jczbmap = new HashMap<>();
 
+                Windpowerstation wp= InitialRunner.wpmap.get(wpId);
+                jczbmap.put("name",wp.getName());
                 /*************************************************风场指标统计*************************************************************/
 
 
@@ -158,6 +185,251 @@ public class MatrixPushByWpService {
                     jczbmap.put("xdts", xdts);
 
 
+
+                } else {
+                    //实时风速
+                    jczbmap.put("ssfs", 0.0);
+                    //预测功率
+                    jczbmap.put("ssfs", 0.0);
+                    //保证功率
+                    jczbmap.put("bzgl", 0.0);
+                    //应发功率
+                    jczbmap.put("yfgl", 0.0);
+                    //实际功率
+                    jczbmap.put("sjgl", 0.0);
+                    //AGC出线有功
+                    jczbmap.put("agccxyg", 0.0);
+                    //AGC有功设定
+                    jczbmap.put("agcygsd", 0.0);
+                    //待机台数
+                    jczbmap.put("djts", 0.0);
+                    //运行台数
+                    jczbmap.put("yxts", 0.0);
+                    //故障台数
+                    jczbmap.put("gzts", 0.0);
+                    //离线台数
+                    jczbmap.put("lxts", 0.0);
+                    //维护台数
+                    jczbmap.put("whts", 0.0);
+                    //限电台数
+                    jczbmap.put("xdts", 0.0);
+                }
+
+
+                fczbmap.put("jczbmap",jczbmap);
+/*************************************************风场指标统计*************************************************************/
+
+
+
+
+/*************************************************风机指标统计*************************************************************/
+                List<String> fjzbls = new ArrayList<>();
+
+                List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
+
+               // Map<String, MatrixVo> vomap = new HashMap<>();
+                List<MatrixVo> vos = new ArrayList<>();
+                for(Windturbine wt:wtls)
+                {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getId());
+                    //风速
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getId());
+                    //功率
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getId());
+                    //发电机转数
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getId());
+
+                }
+
+                List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
+
+                if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
+
+
+                    int step=4;
+                    for(int i=0;i<wtls.size();i++)
+                    {
+                        Windturbine wt=wtls.get(i);
+
+                        MatrixVo vo=new MatrixVo();
+                        vo.setWtId(wt.getId());
+
+                        if(StringUtils.notEmp(wt.getStatus()))
+                        {
+                            String num=wt.getStatus().substring(wt.getStatus().length()-3);
+                            vo.setWtnum(num);
+
+                        }
+
+                        vo.setWpId(wt.getWindpowerstationid());
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                        vo.setFjzt(fjzt);
+                        vo.setFs(MathUtil.twoBit(fjzblist.get(i*step+1).getPointValueInDouble()));
+                        double gl = MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble());
+                        vo.setGl(gl);
+                        vo.setFdjzs(MathUtil.twoBit(fjzblist.get(i*step+3).getPointValueInDouble()));
+                        vo.setWtCode(wt.getCode());
+
+                        if (fjzt == 3) {
+                            vo.setLyl(0.0);
+                        } else {
+                            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
+                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+                                double generatingcapacity = ml.getPowerproduction();
+                                BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                                double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();
+                                vo.setLyl(lyl);
+                            } else {
+                                vo.setLyl(0.0);
+                            }
+                        }
+                        //vomap.put(wt.getId(),vo);
+                        vos.add(vo);
+
+                    }
+
+                }
+                //fjmap.put(wpId,vomap);
+                fjvos.add(vos);
+/*************************************************风机指标统计*************************************************************/
+
+
+
+
+            }
+
+            //风场指标MAP
+            map.put("fczbmap", fczbmap);
+            //风机指标MAP
+            map.put("fjmap", fjvos);
+
+
+
+        }
+
+
+
+        return map;
+    }
+
+    /**
+     * 风场总貌
+     * @param wpId
+     * @return
+     * @throws Exception
+     */
+    private Map<String, Object> findGeneralAppearance(String wpId) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(InitialRunner.wpmap.containsKey(wpId))
+        {
+
+            Map<String, Object> wpmap = new HashMap<String, Object>();
+
+            int fcdjnum = 0;
+            int fcyxnum = 0;
+            int fcgznum = 0;
+            int fclxnum = 0;
+            int fcwhnum = 0;
+            int fcxdnum = 0;
+
+            int gfdjnum = 0;
+            int gfyxnum = 0;
+            int gfgznum = 0;
+            int gflxnum = 0;
+            int gfwhnum = 0;
+            int gfxdnum = 0;
+            String[] ycPoints1 = Constant.TPOINT_WP_FGLYC.split(",");
+
+            //        Map<String, List<MatrixVo>> fjmap = new HashMap<>();
+            List< List<MatrixVo>> fjvos=new ArrayList<>();
+            Map<String, Map<String, Object>> fczbmap = new HashMap<>();
+
+
+
+            if(StringUtils.notEmp(wpId))
+            {
+                Map<String, Object> jczbmap = new HashMap<>();
+
+                Windpowerstation wp= InitialRunner.wpmap.get(wpId);
+                jczbmap.put("name",wp.getName());
+                /*************************************************风场指标统计*************************************************************/
+
+
+                List<String> jczbls = new ArrayList<>();
+                //实时风速
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
+                //预测功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
+                //保证功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
+                //应发功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
+                //实际功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
+                //AGC出线有功
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
+                //AGC有功设定
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC002).getCode());
+                //待机台数
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS).getCode());
+                //运行台数
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS).getCode());
+                //故障台数
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ).getCode());
+                //离线台数
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD).getCode());
+                //维护台数
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ).getCode());
+                //限电台数
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_XDTS).getCode());
+
+
+                List<PointData> jczblist = realApiUtil.getRealData(jczbls);
+
+                if (!jczblist.isEmpty() && jczblist.size() == jczbls.size()) {
+
+                    //实时风速
+                    jczbmap.put("ssfs", MathUtil.twoBit(jczblist.get(0).getPointValueInDouble()));
+                    //预测功率
+                    jczbmap.put("ycgl", MathUtil.twoBit(jczblist.get(1).getPointValueInDouble()));
+                    //保证功率
+                    double bzgl = new BigDecimal(jczblist.get(2).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    jczbmap.put("bzgl", bzgl);
+                    //应发功率
+                    double yfgl = new BigDecimal(jczblist.get(3).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    jczbmap.put("yfgl", yfgl);
+                    //实际功率
+                    jczbmap.put("sjgl", MathUtil.twoBit(jczblist.get(4).getPointValueInDouble()));
+                    //AGC出线有功
+                    jczbmap.put("agccxyg", MathUtil.twoBit(jczblist.get(5).getPointValueInDouble()));
+                    //AGC有功设定
+                    jczbmap.put("agcygsd", MathUtil.twoBit(jczblist.get(6).getPointValueInDouble()));
+
+
+                    Double djts = MathUtil.twoBit(jczblist.get(7).getPointValueInDouble());
+                    //待机台数
+                    jczbmap.put("djts", djts);
+                    //运行台数
+                    Double yxts = MathUtil.twoBit(jczblist.get(8).getPointValueInDouble());
+                    jczbmap.put("yxts", yxts);
+                    //故障台数
+                    Double gzts = MathUtil.twoBit(jczblist.get(9).getPointValueInDouble());
+                    jczbmap.put("gzts", gzts);
+                    //离线台数
+                    Double lxts = MathUtil.twoBit(jczblist.get(10).getPointValueInDouble());
+                    jczbmap.put("lxts", lxts);
+                    //维护台数
+                    Double whts = MathUtil.twoBit(jczblist.get(11).getPointValueInDouble());
+                    jczbmap.put("whts", whts);
+                    //限电台数
+                    Double xdts = MathUtil.twoBit(jczblist.get(12).getPointValueInDouble());
+                    jczbmap.put("xdts", xdts);
+
+
+
                 } else {
                     //实时风速
                     jczbmap.put("ssfs", 0.0);
@@ -196,6 +468,237 @@ public class MatrixPushByWpService {
 /*************************************************风场指标统计*************************************************************/
 
 
+/*************************************************五项损失**************************************************************/
+
+                Map<String, Double> wxssmap = new HashMap<>();
+                List<String> wxssls = new ArrayList<>();
+
+                // 日场内受累检修
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL).getCode());
+                // 日场内受累故障
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL).getCode());
+                // 月场内受累检修
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YLZSSDL).getCode());
+                // 月场内受累故障
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSZSSDL).getCode());
+                // 年场内受累检修
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NLZSSDL).getCode());
+                // 年场内受累故障
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSZSSDL).getCode());
+
+                //日待机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL).getCode());
+                //日手动停机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL).getCode());
+                //日性能损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL).getCode());
+                //日缺陷降出力损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL).getCode());
+                //日故障损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL).getCode());
+                //日检修损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL).getCode());
+
+                //月待机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSDJZSDL).getCode());
+                //月手动停机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSSTZSDL).getCode());
+                //月性能损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXNZSDL).getCode());
+                //月缺陷降出力损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSQXZSDL).getCode());
+                //月故障损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YGZSSDL).getCode());
+                //月检修损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YJXSSDL).getCode());
+
+
+                //年待机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSDJZSDL).getCode());
+                //年手动停机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSSTZSDL).getCode());
+                //年性能损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXNZSDL).getCode());
+                //年缺陷降出力损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSQXZSDL).getCode());
+                //年故障损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NGZSSDL).getCode());
+                //年检修损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NJXSSDL).getCode());
+
+
+                //日限电损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXDSSDL).getCode());
+                //月限电损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXDSSDL).getCode());
+                //年限电损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXDSSDL).getCode());
+
+
+                //日场外受累电网
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RWZSSDL).getCode());
+                // 日场外受累天气
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RTZSSDL).getCode());
+                // 月场外受累电网
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YWZSSDL).getCode());
+                // 月场外受累天气
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YTZSSDL).getCode());
+                // 年场外受累电网
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NWZSSDL).getCode());
+                // 年场外受累天气
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NTZSSDL).getCode());
+
+
+                List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
+
+                if (!wxsslist.isEmpty() && wxsslist.size() == wxssls.size()) {
+
+                    Double rjxsl = MathUtil.twoBit(wxsslist.get(0).getPointValueInDouble());
+                    // 日场内受累故障
+                    Double rgzzsl = MathUtil.twoBit(wxsslist.get(1).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double yjxsl = MathUtil.twoBit(wxsslist.get(2).getPointValueInDouble());
+                    // 月场内受累故障
+                    Double ygzzsl = MathUtil.twoBit(wxsslist.get(3).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double njxsl = MathUtil.twoBit(wxsslist.get(4).getPointValueInDouble());
+                    // 年场内受累故障
+                    Double ngzzsl = MathUtil.twoBit(wxsslist.get(5).getPointValueInDouble());
+
+                    wxssmap.put("rjxsl", rjxsl);
+                    wxssmap.put("rgzzsl", rgzzsl);
+                    wxssmap.put("yjxsl", yjxsl);
+                    wxssmap.put("ygzzsl", ygzzsl);
+                    wxssmap.put("njxsl", njxsl);
+                    wxssmap.put("ngzzsl", ngzzsl);
+
+                    //日待机损失
+                    Double rdjss = MathUtil.twoBit(wxsslist.get(6).getPointValueInDouble());
+                    //日手动停机损失
+                    Double rsdtjss = MathUtil.twoBit(wxsslist.get(7).getPointValueInDouble());
+                    //日性能损失
+                    Double rxnss = MathUtil.twoBit(wxsslist.get(8).getPointValueInDouble());
+                    //日缺陷降出力损失
+                    Double rqxjclss = MathUtil.twoBit(wxsslist.get(9).getPointValueInDouble());
+
+                    //日欠发损失=日待机损失+日手动停机损失+日性能损失+日缺陷降出力损失
+                    Double rqfssdl = new BigDecimal(rdjss + rsdtjss + rxnss + rqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double rgzss = MathUtil.twoBit(wxsslist.get(10).getPointValueInDouble());
+                    //日故障损失电量=日故障损失+日故障受累
+                    Double rgzssdl = new BigDecimal(rgzss + rgzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    //日检修损失电量=日检修损失+日检修受累
+                    Double rjxss = MathUtil.twoBit(wxsslist.get(11).getPointValueInDouble());
+                    Double rjxssdl = new BigDecimal(rjxss + rjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+
+                    wxssmap.put("rqfssdl", rqfssdl);
+                    wxssmap.put("rgzssdl", rgzssdl);
+                    wxssmap.put("rjxssdl", rjxssdl);
+
+                    // 月场内受累检修
+                    Double ydjss = MathUtil.twoBit(wxsslist.get(12).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double ysdtjss = MathUtil.twoBit(wxsslist.get(13).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double yxnss = MathUtil.twoBit(wxsslist.get(14).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double yqxjclss = MathUtil.twoBit(wxsslist.get(15).getPointValueInDouble());
+                    //月欠发损失=月待机损失+月手动停机损失+月性能损失+月缺陷降出力损失
+                    Double yqfssdl = new BigDecimal(ydjss + ysdtjss + yxnss + yqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double ygzss = MathUtil.twoBit(wxsslist.get(16).getPointValueInDouble());
+                    //月故障损失电量=月故障损失+月故障受累
+                    Double ygzssdl = new BigDecimal(ygzss + ygzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double yjxss = MathUtil.twoBit(wxsslist.get(17).getPointValueInDouble());
+                    //月检修损失电量=月检修损失+月检修受累
+                    Double yjxssdl = new BigDecimal(yjxss + yjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("yqfssdl", yqfssdl);
+                    wxssmap.put("ygzssdl", ygzssdl);
+                    wxssmap.put("yjxssdl", yjxssdl);
+
+                    // 年场内受累检修
+                    Double ndjss = MathUtil.twoBit(wxsslist.get(18).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double nsdtjss = MathUtil.twoBit(wxsslist.get(19).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double nxnss = MathUtil.twoBit(wxsslist.get(20).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double nqxjclss = MathUtil.twoBit(wxsslist.get(21).getPointValueInDouble());
+
+                    Double nqfssdl = new BigDecimal(ndjss + nsdtjss + nxnss + nqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double ngzss = MathUtil.twoBit(wxsslist.get(22).getPointValueInDouble());
+                    //年故障损失电量=年故障损失+年故障受累
+                    Double ngzssdl = new BigDecimal(ngzss + ngzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double njxss = MathUtil.twoBit(wxsslist.get(23).getPointValueInDouble());
+                    //年检修损失电量=年检修损失+年检修受累
+                    Double njxssdl = new BigDecimal(njxss + njxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("nqfssdl", nqfssdl);
+                    wxssmap.put("ngzssdl", ngzssdl);
+                    wxssmap.put("njxssdl", njxssdl);
+
+                    double temp = 0.0;
+                    temp = MathUtil.twoBit(wxsslist.get(24).getPointValueInDouble());
+                    Double rxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    temp = MathUtil.twoBit(wxsslist.get(25).getPointValueInDouble());
+                    Double yxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    temp = MathUtil.twoBit(wxsslist.get(26).getPointValueInDouble());
+                    Double nxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("rxdssdl", StringUtils.round(rxdssdl < 0.0 ? 0.0 : rxdssdl, 2));
+                    wxssmap.put("yxdssdl", StringUtils.round(yxdssdl < 0.0 ? 0.0 : yxdssdl, 2));
+                    wxssmap.put("nxdssdl", StringUtils.round(nxdssdl < 0.0 ? 0.0 : nxdssdl, 2));
+
+                    Double rdwsl = MathUtil.twoBit(wxsslist.get(27).getPointValueInDouble());
+                    Double rtqsl = MathUtil.twoBit(wxsslist.get(28).getPointValueInDouble());
+                    Double rslssdl = new BigDecimal(rdwsl + rtqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double ydwsl = MathUtil.twoBit(wxsslist.get(29).getPointValueInDouble());
+                    Double ytqsl = MathUtil.twoBit(wxsslist.get(30).getPointValueInDouble());
+                    Double yslssdl = new BigDecimal(ydwsl + ytqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double ndwsl = MathUtil.twoBit(wxsslist.get(31).getPointValueInDouble());
+                    Double ntqsl = MathUtil.twoBit(wxsslist.get(32).getPointValueInDouble());
+                    Double nslssdl = new BigDecimal(ndwsl + ntqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("rslssdl", rslssdl);
+                    wxssmap.put("yslssdl", yslssdl);
+                    wxssmap.put("nslssdl", nslssdl);
+
+                } else {
+
+                    wxssmap.put("rjxsl", 0.0);
+                    wxssmap.put("rgzzsl", 0.0);
+                    wxssmap.put("yjxsl", 0.0);
+                    wxssmap.put("ygzzsl", 0.0);
+                    wxssmap.put("njxsl", 0.0);
+                    wxssmap.put("ngzzsl", 0.0);
+                    wxssmap.put("rqfssdl", 0.0);
+                    wxssmap.put("rgzssdl", 0.0);
+                    wxssmap.put("rjxssdl", 0.0);
+
+                    wxssmap.put("yqfssdl", 0.0);
+                    wxssmap.put("ygzssdl", 0.0);
+                    wxssmap.put("yjxssdl", 0.0);
+
+                    wxssmap.put("nqfssdl", 0.0);
+                    wxssmap.put("ngzssdl", 0.0);
+                    wxssmap.put("njxssdl", 0.0);
+
+
+                    wxssmap.put("rxdssdl", 0.0);
+                    wxssmap.put("yxdssdl", 0.0);
+                    wxssmap.put("nxdssdl", 0.0);
+
+
+                    wxssmap.put("rslssdl", 0.0);
+                    wxssmap.put("yslssdl", 0.0);
+                    wxssmap.put("nslssdl", 0.0);
+
+                }
+                map.put("wxssmap", wxssmap);
+/*************************************************五项损失**************************************************************/
 
 
 /*************************************************风机指标统计*************************************************************/
@@ -203,8 +706,8 @@ public class MatrixPushByWpService {
 
                 List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
 
-                Map<String, MatrixVo> vomap = new HashMap<>();
-
+                // Map<String, MatrixVo> vomap = new HashMap<>();
+                List<MatrixVo> vos = new ArrayList<>();
                 for(Windturbine wt:wtls)
                 {
                     //风机状态
@@ -213,6 +716,8 @@ public class MatrixPushByWpService {
                     fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJSSFS).getId());
                     //功率
                     fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getId());
+                    //发电机转数
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getId());
 
                 }
 
@@ -221,7 +726,7 @@ public class MatrixPushByWpService {
                 if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
 
 
-                    int step=3;
+                    int step=4;
                     for(int i=0;i<wtls.size();i++)
                     {
                         Windturbine wt=wtls.get(i);
@@ -237,28 +742,66 @@ public class MatrixPushByWpService {
                         }
 
                         vo.setWpId(wt.getWindpowerstationid());
-                        vo.setFjzt(MathUtil.twoBit(fjzblist.get(i*step).getPointValueInDouble()));
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                        vo.setFjzt(fjzt);
                         vo.setFs(MathUtil.twoBit(fjzblist.get(i*step+1).getPointValueInDouble()));
-                        vo.setGl(MathUtil.twoBit(fjzblist.get(i*step+2).getPointValueInDouble()));
+                        double gl = MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble());
+                        vo.setGl(gl);
+                        vo.setFdjzs(MathUtil.twoBit(fjzblist.get(i*step+3).getPointValueInDouble()));
                         vo.setWtCode(wt.getCode());
-                        vomap.put(wt.getId(),vo);
+
+                        if (fjzt == 3) {
+                            vo.setLyl(0.0);
+                        } else {
+                            if (InitialRunner.mlmap.containsKey(wt.getModelid())) {
+                                Equipmentmodel ml = InitialRunner.mlmap.get(wt.getModelid());
+                                double generatingcapacity = ml.getPowerproduction();
+                                BigDecimal temp = new BigDecimal(generatingcapacity).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                                double lyl = new BigDecimal(gl).divide(temp, 2, RoundingMode.HALF_UP).doubleValue();
+                                vo.setLyl(lyl);
+                            } else {
+                                vo.setLyl(0.0);
+                            }
+                        }
+                        //vomap.put(wt.getId(),vo);
+                        vos.add(vo);
 
                     }
 
                 }
-                fjmap.put(wpId,vomap);
-
+                //fjmap.put(wpId,vomap);
+                fjvos.add(vos);
 /*************************************************风机指标统计*************************************************************/
 
+/*************************************************关系库**************************************************************/
 
 
+            Map<String, Double> gxkmap = new HashMap<>();
+            List<Windpowerinfoday> wpdls = windpowerinfodayService.getWindpowerinfodayList(wpId, DateUtils.truncate(new Date()));
+            if (!wpdls.isEmpty()) {
+                Windpowerinfoday wd = wpdls.get(0);
+                gxkmap.put("ndxkyss", wd.getYeardxkyxs());
+                gxkmap.put("nsbklyl", wd.getYearsbklyl());
+
+                gxkmap.put("ydxkyss", wd.getMonthdxkyxs());
+                gxkmap.put("ysbklyl", wd.getMonthsbklyl());
+
+            } else {
+                gxkmap.put("ndxkyss", 0.0);
+                gxkmap.put("nsbklyl", 0.0);
+                gxkmap.put("ydxkyss", 0.0);
+                gxkmap.put("ysbklyl", 0.0);
+            }
+            map.put("gxkmap", gxkmap);
+
+/*************************************************关系库指标**************************************************************/
 
             }
 
             //风场指标MAP
             map.put("fczbmap", fczbmap);
             //风机指标MAP
-            map.put("fjmap", fjmap);
+            map.put("fjmap", fjvos);
 
 
 
@@ -270,6 +813,73 @@ public class MatrixPushByWpService {
     }
 
 
+    private Map<String, Object> findSimpleMatrix(String wpId) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(InitialRunner.wpmap.containsKey(wpId))
+        {
+            List< List<MatrixVo>> fjvos=new ArrayList<>();
+
+
+
+
+/*************************************************风机指标统计*************************************************************/
+                List<String> fjzbls = new ArrayList<>();
+
+                List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
+
+                // Map<String, MatrixVo> vomap = new HashMap<>();
+                List<MatrixVo> vos = new ArrayList<>();
+                for(Windturbine wt:wtls)
+                {
+                    //风机状态
+                    fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getId());
+
+                }
+
+                List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
+
+                if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
+
+                    for(int i=0;i<wtls.size();i++)
+                    {
+                        Windturbine wt=wtls.get(i);
+
+                        MatrixVo vo=new MatrixVo();
+                        vo.setWtId(wt.getId());
+
+                        if(StringUtils.notEmp(wt.getStatus()))
+                        {
+                            String num=wt.getStatus().substring(wt.getStatus().length()-3);
+                            vo.setWtnum(num);
+
+                        }
+
+                        vo.setWpId(wt.getWindpowerstationid());
+                        double fjzt = MathUtil.twoBit(fjzblist.get(i).getPointValueInDouble());
+                        vo.setFjzt(fjzt);
+                        vo.setWtCode(wt.getCode());
+
+                        vos.add(vo);
+
+                    }
+
+                }
+                //fjmap.put(wpId,vomap);
+                fjvos.add(vos);
+/*************************************************风机指标统计*************************************************************/
+
+
+
+        //风机指标MAP
+        map.put("fjmap", fjvos);
+        }
+
+
+
+        return map;
+    }
 }
 
 

+ 1 - 1
src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java

@@ -233,7 +233,7 @@ public class MatrixQfPushService {
                     }
                     double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
                     vo.setFjzt(fjzt);
-                    double fs = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
+                    double fs = MathUtil.twoBit(fjzblist.get(i * step+1).getPointValueInDouble());
                     vo.setFs(fs);
                     double gl = MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble());
                     vo.setGl(gl);

+ 829 - 7
src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -5,6 +5,7 @@ import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.ZtjsVo;
 import com.gyee.frame.service.ProjectPlanService;
@@ -19,10 +20,8 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class WpInfoPushService {
@@ -34,7 +33,10 @@ public class WpInfoPushService {
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
     private ProjectPlanService projectPlanService;
-
+    @Resource
+    private MatrixPushByWpService matrixPushByWpService;
+    @Resource
+    private RealPowerPushService realPowerPushService;
 
     IRealTimeDataBaseUtil realApiUtil = new EdosUtil();
 
@@ -48,10 +50,32 @@ public class WpInfoPushService {
 //        map.put("SBQ02_GC",findWpInfo("SBQ02_GC"));
 //        map.put("SBQ05_XL",findWpInfo("SBQ05_XL"));
 
+//        Map<String, Object> map=new HashMap<>();
+
         return map;
 
     }
 
+
+    public Map<String, Object> genreSetMap(String wpId) throws Exception {
+
+        Map<String, Object> map = findWpInfoBy(wpId);
+
+//        map.put("SBQ_FDC",findWpInfo("SBQ_FDC"));
+//        map.put("SBQ02_GC",findWpInfo("SBQ02_GC"));
+//        map.put("SBQ05_XL",findWpInfo("SBQ05_XL"));
+
+//        Map<String, Object> map=new HashMap<>();
+
+        return map;
+
+    }
+
+    /**
+     * 状态监视页面
+     * @return
+     * @throws Exception
+     */
     public Map<String, Object> findWpInfo() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
 
@@ -153,7 +177,7 @@ public class WpInfoPushService {
                 vo.setScadafdl(scadafdl);
                 //预测功率
                 double ycgl = StringUtils.round(jczblist.get(10).getPointValueInDouble(), 2);
-                // jczbmap.put("ycgl",ycgl );
+                 jczbmap.put("ycgl",ycgl );
                 vo.setYcgl(ycgl);
                 //AGC出线有功
                 double agccxyg = StringUtils.round(jczblist.get(11).getPointValueInDouble(), 2);
@@ -263,7 +287,7 @@ public class WpInfoPushService {
                         jczbmap.put("ia", MathUtil.twoBit(temp3 + temp4));
                         double temp5 = zblist.get(4).getPointValueInDouble();
                         double temp6 = zblist.get(5).getPointValueInDouble();
-                        jczbmap.put("ia", MathUtil.twoBit(temp5 + temp6));
+                        jczbmap.put("dnlb", MathUtil.twoBit(temp5 + temp6));
                     }
                     break;
                 case "QS_FDC":
@@ -1025,6 +1049,804 @@ public class WpInfoPushService {
 
     }
 
+
+    /**
+     * 获取风场监视页面
+     * @param wpId
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> findWpInfoBy(String wpId) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        List<ZtjsVo> vos = new ArrayList<>();
+        List<Map<String, Object>> maps = new ArrayList<>();
+
+        if (InitialRunner.wpmap.containsKey(wpId)) {
+
+            Windpowerstation wp=InitialRunner.wpmap.get(wpId);
+
+
+            Map<String, Object> jczbmap = new HashMap<String, Object>();
+            String id = wp.getId();
+
+            Double zjrl = 0.0;
+            Double zjts = 0.0;
+
+            Double sjgl = 0.0;
+            Double bzgl = 0.0;
+            Double yfgl = 0.0;
+
+/*************************************************基础指标*************************************************************/
+
+            zjrl = wp.getCapacity();
+            zjts = Double.valueOf(wp.getQuantity());
+            jczbmap.put("name",wp.getName());
+            jczbmap.put("zjrl",zjrl);
+
+
+            List<String> jczbls = new ArrayList<>();
+
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
+
+            //待机台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.DJNUM).getCode());
+            //手动停机台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TJNUM).getCode());
+            //正常发电台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDNUM).getCode());
+            // 缺陷降出力台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDJCLNUM).getCode());
+            // 限电降出力台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDJCLNUM).getCode());
+            // 限电停机台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDTJNUM).getCode());
+            // 故障停机台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.GZNUM).getCode());
+            // 场内受累停机台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNGZNUM).getCode());
+            // 检修停机台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.JXNUM).getCode());
+            // 场内受累检修台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNJXNUM).getCode());
+            // 电网受累台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.DWSLNUM).getCode());
+            // 环境受累台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.HJSLNUM).getCode());
+            // 风机离线台数
+            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.LXNUM).getCode());
+
+
+            List<PointData> jczblist = realApiUtil.getRealData(jczbls);
+
+            if (!jczblist.isEmpty() && jczblist.size() == jczbls.size()) {
+                //日发电量
+                double rfdl = MathUtil.twoBit(jczblist.get(0).getPointValueInDouble());
+
+                jczbmap.put("rfdl", rfdl);
+
+                //月发电量
+                double yfdl=MathUtil.twoBit(jczblist.get(1).getPointValueInDouble());
+                jczbmap.put("yfdl", yfdl);
+                //年发电量
+                double nfdl=MathUtil.twoBit(jczblist.get(2).getPointValueInDouble());
+                jczbmap.put("nfdl", nfdl);
+                //月利用小时
+                double ylyxs = (new BigDecimal(jczblist.get(1).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jczbmap.put("ylyxs",ylyxs );
+                //年利用小时
+                double nlyxs= (new BigDecimal(jczblist.get(2).getPointValueInDouble()).multiply(new BigDecimal(10))).divide(new BigDecimal(zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jczbmap.put("nlyxs",nlyxs);
+                //实时风速
+                double ssfs = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble());
+                jczbmap.put("ssfs",ssfs );
+                //实际功率
+                sjgl = MathUtil.twoBit(jczblist.get(4).getPointValueInDouble());
+
+                jczbmap.put("sjgl", sjgl);
+
+
+
+//待机台数
+                Double djnum = MathUtil.twoBit(jczblist.get(5).getPointValueInDouble());
+                jczbmap.put("djnum", djnum);
+                //手动停机台数
+                Double sdtjnum = MathUtil.twoBit(jczblist.get(6).getPointValueInDouble());
+                jczbmap.put("sdtjts", sdtjnum);
+                //正常发电台数
+                Double zcfdnum = MathUtil.twoBit(jczblist.get(7).getPointValueInDouble());
+                jczbmap.put("zcfdnum", zcfdnum);
+                //缺陷降出力台数
+                Double qxjclnum = MathUtil.twoBit(jczblist.get(8).getPointValueInDouble());
+                jczbmap.put("qxjclnum", qxjclnum);
+                // 限电降出力台数
+                Double xdjclnum = MathUtil.twoBit(jczblist.get(9).getPointValueInDouble());
+                jczbmap.put("xdjclnum", xdjclnum);
+                // 限电停机台数
+                Double xdtjnum = MathUtil.twoBit(jczblist.get(10).getPointValueInDouble());
+                jczbmap.put("xdtjnum", xdtjnum);
+                // 故障停机台数
+                Double gztjnum = MathUtil.twoBit(jczblist.get(11).getPointValueInDouble());
+                jczbmap.put("gztjnum", gztjnum);
+                // 场内受累停机台数
+                Double cnsltjnum = MathUtil.twoBit(jczblist.get(12).getPointValueInDouble());
+                jczbmap.put("cnsltjnum", cnsltjnum);
+                // 检修停机台数
+                Double jxtjnum = MathUtil.twoBit(jczblist.get(13).getPointValueInDouble());
+                jczbmap.put("jxtjnum", jxtjnum);
+                // 场内受累检修台数
+                Double cnsljxnum = MathUtil.twoBit(jczblist.get(14).getPointValueInDouble());
+                jczbmap.put("cnsljxnum", cnsljxnum);
+                // 电网受累台数
+                Double dwslnum = MathUtil.twoBit(jczblist.get(15).getPointValueInDouble());
+                jczbmap.put("dwslnum", dwslnum);
+                // 环境受累台数
+                Double hjslnum = MathUtil.twoBit(jczblist.get(16).getPointValueInDouble());
+                jczbmap.put("hjslnum", hjslnum);
+                // 风机离线台数
+                Double lxnum = MathUtil.twoBit(jczblist.get(17).getPointValueInDouble());
+                jczbmap.put("lxnum", lxnum);
+
+//
+//                double djts=djnum+sdtjnum;
+//                double yxts=zcfdnum+qxjclnum;
+//                double gzts=gztjnum+cnsltjnum;
+//                double lxts=lxnum;
+//                double whts=jxtjnum+cnsljxnum;
+//                double xdts=xdjclnum+xdtjnum;
+//                double slts=dwslnum+hjslnum;
+//
+//                jczbmap.put("djts", djts);
+//                jczbmap.put("yxts", yxts);
+//                jczbmap.put("gzts", gzts);
+//                jczbmap.put("lxts", lxts);
+//                jczbmap.put("whts", whts);
+//                jczbmap.put("xdts", xdts);
+//                jczbmap.put("slts", slts);
+
+                jczbmap.put("jrts",djnum+sdtjnum+zcfdnum+qxjclnum+xdjclnum+xdtjnum+gztjnum+cnsltjnum+jxtjnum+cnsljxnum+dwslnum+hjslnum+lxnum);
+            } else {
+                //实际功率
+                jczbmap.put("sjgl", 0.0);
+                //日发电量
+                jczbmap.put("rfdl", 0.0);
+                //月发电量
+                jczbmap.put("yfdl", 0.0);
+                //年发电量
+                jczbmap.put("nfdl", 0.0);
+                //月利用小时
+                jczbmap.put("ylyxs", 0.0);
+                //年利用小时
+                jczbmap.put("nlyxs", 0.0);
+                //实时风速
+                jczbmap.put("ssfs", 0.0);
+
+                //待机台数
+                jczbmap.put("djnum",  0.0);
+                //手动停机台数
+                jczbmap.put("sdtjts", 0.0);
+                //正常发电台数
+                jczbmap.put("zcfdnum", 0.0);
+                //缺陷降出力台数
+                jczbmap.put("qxjclnum", 0.0);
+                // 限电降出力台数
+                jczbmap.put("xdjclnum", 0.0);
+                // 限电停机台数
+                jczbmap.put("xdtjnum", 0.0);
+                // 故障停机台数
+                jczbmap.put("gztjnum", 0.0);
+                // 场内受累停机台数
+                jczbmap.put("cnsltjnum", 0.0);
+                // 检修停机台数
+                jczbmap.put("jxtjnum", 0.0);
+                // 场内受累检修台数
+                jczbmap.put("cnsljxnum", 0.0);
+                // 电网受累台数
+                jczbmap.put("dwslnum", 0.0);
+                // 环境受累台数
+                jczbmap.put("hjslnum", 0.0);
+                // 风机离线台数
+                jczbmap.put("lxnum", 0.0);
+                // 接入台数
+                jczbmap.put("jrts", 0.0);
+
+            }
+
+
+
+
+/*************************************************基础指标*************************************************************/
+
+
+
+/*************************************************五项损失**************************************************************/
+
+            Map<String, Double> wxssmap = new HashMap<>();
+            List<String> wxssls = new ArrayList<>();
+
+            // 日场内受累检修
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
+            // 日场内受累故障
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
+            // 月场内受累检修
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
+            // 月场内受累故障
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
+            // 年场内受累检修
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
+            // 年场内受累故障
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
+
+            //日待机损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
+            //日手动停机损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
+            //日性能损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
+            //日缺陷降出力损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
+            //日故障损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
+            //日检修损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
+
+            //月待机损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
+            //月手动停机损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
+            //月性能损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
+            //月缺陷降出力损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
+            //月故障损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
+            //月检修损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
+
+
+            //年待机损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
+            //年手动停机损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
+            //年性能损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
+            //年缺陷降出力损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
+            //年故障损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
+            //年检修损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
+
+
+            //日限电损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
+            //月限电损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
+            //年限电损失
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
+
+
+            //日场外受累电网
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
+            // 日场外受累天气
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
+            // 月场外受累电网
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
+            // 月场外受累天气
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
+            // 年场外受累电网
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
+            // 年场外受累天气
+            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
+
+
+            List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
+
+            if (!wxsslist.isEmpty() && wxsslist.size() == wxssls.size()) {
+
+                Double rjxsl = MathUtil.twoBit(wxsslist.get(0).getPointValueInDouble());
+                // 日场内受累故障
+                Double rgzzsl = MathUtil.twoBit(wxsslist.get(1).getPointValueInDouble());
+                // 月场内受累检修
+                Double yjxsl = MathUtil.twoBit(wxsslist.get(2).getPointValueInDouble());
+                // 月场内受累故障
+                Double ygzzsl = MathUtil.twoBit(wxsslist.get(3).getPointValueInDouble());
+                // 年场内受累检修
+                Double njxsl = MathUtil.twoBit(wxsslist.get(4).getPointValueInDouble());
+                // 年场内受累故障
+                Double ngzzsl = MathUtil.twoBit(wxsslist.get(5).getPointValueInDouble());
+
+                wxssmap.put("rjxsl", rjxsl);
+                wxssmap.put("rgzzsl", rgzzsl);
+                wxssmap.put("yjxsl", yjxsl);
+                wxssmap.put("ygzzsl", ygzzsl);
+                wxssmap.put("njxsl", njxsl);
+                wxssmap.put("ngzzsl", ngzzsl);
+
+                //日待机损失
+                Double rdjss = MathUtil.twoBit(wxsslist.get(6).getPointValueInDouble());
+                //日手动停机损失
+                Double rsdtjss = MathUtil.twoBit(wxsslist.get(7).getPointValueInDouble());
+                //日性能损失
+                Double rxnss = MathUtil.twoBit(wxsslist.get(8).getPointValueInDouble());
+                //日缺陷降出力损失
+                Double rqxjclss = MathUtil.twoBit(wxsslist.get(9).getPointValueInDouble());
+
+                //日欠发损失=日待机损失+日手动停机损失+日性能损失+日缺陷降出力损失
+                Double rqfssdl = new BigDecimal(rdjss + rsdtjss + rxnss + rqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                Double rgzss = MathUtil.twoBit(wxsslist.get(10).getPointValueInDouble());
+                //日故障损失电量=日故障损失+日故障受累
+                Double rgzssdl = new BigDecimal(rgzss + rgzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                //日检修损失电量=日检修损失+日检修受累
+                Double rjxss = MathUtil.twoBit(wxsslist.get(11).getPointValueInDouble());
+                Double rjxssdl = new BigDecimal(rjxss + rjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+
+                wxssmap.put("rqfssdl", rqfssdl);
+                wxssmap.put("rgzssdl", rgzssdl);
+                wxssmap.put("rjxssdl", rjxssdl);
+
+                // 月场内受累检修
+                Double ydjss = MathUtil.twoBit(wxsslist.get(12).getPointValueInDouble());
+                // 月场内受累检修
+                Double ysdtjss = MathUtil.twoBit(wxsslist.get(13).getPointValueInDouble());
+                // 月场内受累检修
+                Double yxnss = MathUtil.twoBit(wxsslist.get(14).getPointValueInDouble());
+                // 月场内受累检修
+                Double yqxjclss = MathUtil.twoBit(wxsslist.get(15).getPointValueInDouble());
+                //月欠发损失=月待机损失+月手动停机损失+月性能损失+月缺陷降出力损失
+                Double yqfssdl = new BigDecimal(ydjss + ysdtjss + yxnss + yqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                Double ygzss = MathUtil.twoBit(wxsslist.get(16).getPointValueInDouble());
+                //月故障损失电量=月故障损失+月故障受累
+                Double ygzssdl = new BigDecimal(ygzss + ygzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                Double yjxss = MathUtil.twoBit(wxsslist.get(17).getPointValueInDouble());
+                //月检修损失电量=月检修损失+月检修受累
+                Double yjxssdl = new BigDecimal(yjxss + yjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                wxssmap.put("yqfssdl", yqfssdl);
+                wxssmap.put("ygzssdl", ygzssdl);
+                wxssmap.put("yjxssdl", yjxssdl);
+
+                // 年场内受累检修
+                Double ndjss = MathUtil.twoBit(wxsslist.get(18).getPointValueInDouble());
+                // 年场内受累检修
+                Double nsdtjss = MathUtil.twoBit(wxsslist.get(19).getPointValueInDouble());
+                // 年场内受累检修
+                Double nxnss = MathUtil.twoBit(wxsslist.get(20).getPointValueInDouble());
+                // 年场内受累检修
+                Double nqxjclss = MathUtil.twoBit(wxsslist.get(21).getPointValueInDouble());
+
+                Double nqfssdl = new BigDecimal(ndjss + nsdtjss + nxnss + nqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                Double ngzss = MathUtil.twoBit(wxsslist.get(22).getPointValueInDouble());
+                //年故障损失电量=年故障损失+年故障受累
+                Double ngzssdl = new BigDecimal(ngzss + ngzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                Double njxss = MathUtil.twoBit(wxsslist.get(23).getPointValueInDouble());
+                //年检修损失电量=年检修损失+年检修受累
+                Double njxssdl = new BigDecimal(njxss + njxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                wxssmap.put("nqfssdl", nqfssdl);
+                wxssmap.put("ngzssdl", ngzssdl);
+                wxssmap.put("njxssdl", njxssdl);
+
+                double temp = 0.0;
+                temp = MathUtil.twoBit(wxsslist.get(24).getPointValueInDouble());
+                Double rxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                temp = MathUtil.twoBit(wxsslist.get(25).getPointValueInDouble());
+                Double yxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                temp = MathUtil.twoBit(wxsslist.get(26).getPointValueInDouble());
+                Double nxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                wxssmap.put("rxdssdl", StringUtils.round(rxdssdl < 0.0 ? 0.0 : rxdssdl, 2));
+                wxssmap.put("yxdssdl", StringUtils.round(yxdssdl < 0.0 ? 0.0 : yxdssdl, 2));
+                wxssmap.put("nxdssdl", StringUtils.round(nxdssdl < 0.0 ? 0.0 : nxdssdl, 2));
+
+                Double rdwsl = MathUtil.twoBit(wxsslist.get(27).getPointValueInDouble());
+                Double rtqsl = MathUtil.twoBit(wxsslist.get(28).getPointValueInDouble());
+                Double rslssdl = new BigDecimal(rdwsl + rtqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                Double ydwsl = MathUtil.twoBit(wxsslist.get(29).getPointValueInDouble());
+                Double ytqsl = MathUtil.twoBit(wxsslist.get(30).getPointValueInDouble());
+                Double yslssdl = new BigDecimal(ydwsl + ytqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                Double ndwsl = MathUtil.twoBit(wxsslist.get(31).getPointValueInDouble());
+                Double ntqsl = MathUtil.twoBit(wxsslist.get(32).getPointValueInDouble());
+                Double nslssdl = new BigDecimal(ndwsl + ntqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                wxssmap.put("rslssdl", rslssdl);
+                wxssmap.put("yslssdl", yslssdl);
+                wxssmap.put("nslssdl", nslssdl);
+
+            } else {
+
+                wxssmap.put("rjxsl", 0.0);
+                wxssmap.put("rgzzsl", 0.0);
+                wxssmap.put("yjxsl", 0.0);
+                wxssmap.put("ygzzsl", 0.0);
+                wxssmap.put("njxsl", 0.0);
+                wxssmap.put("ngzzsl", 0.0);
+                wxssmap.put("rqfssdl", 0.0);
+                wxssmap.put("rgzssdl", 0.0);
+                wxssmap.put("rjxssdl", 0.0);
+
+                wxssmap.put("yqfssdl", 0.0);
+                wxssmap.put("ygzssdl", 0.0);
+                wxssmap.put("yjxssdl", 0.0);
+
+                wxssmap.put("nqfssdl", 0.0);
+                wxssmap.put("ngzssdl", 0.0);
+                wxssmap.put("njxssdl", 0.0);
+
+
+                wxssmap.put("rxdssdl", 0.0);
+                wxssmap.put("yxdssdl", 0.0);
+                wxssmap.put("nxdssdl", 0.0);
+
+
+                wxssmap.put("rslssdl", 0.0);
+                wxssmap.put("yslssdl", 0.0);
+                wxssmap.put("nslssdl", 0.0);
+
+            }
+            map.put("wxssmap", wxssmap);
+/*************************************************五项损失**************************************************************/
+
+/*************************************************风机矩阵指标**************************************************************/
+
+
+            Map<String, Object> fjjzmap=matrixPushByWpService.findSimpleMatrixById(wp.getId());
+
+            map.put("fjjzmap", fjjzmap);
+/*************************************************风机矩阵指标**************************************************************/
+
+/*************************************************功率曲线**************************************************************/
+
+
+            List<DataVo> glvos=realPowerPushService.findRealPower(wp.getId());
+
+            map.put("glvos", glvos);
+/*************************************************功率曲线**************************************************************/
+
+/*************************************************日损失**************************************************************/
+
+//
+//            List<DataVo> lossvos=findLossWpBar(wp.getId());
+//
+//            map.put("lossvos", lossvos);
+/*************************************************日损失**************************************************************/
+
+/*************************************************日发电量**************************************************************/
+
+
+//            List<DataVo> rfdlvos=findPowerWpBar(wp.getId());
+//
+//            map.put("rfdlvos", rfdlvos);
+/*************************************************日发电量**************************************************************/
+
+/*************************************************月发电量**************************************************************/
+
+
+//            List<DataVo> yfdlvos=findMonthPowerWpBar(wp.getId());
+//
+//            map.put("yfdlvos", yfdlvos);
+/*************************************************月发电量**************************************************************/
+
+/*************************************************日发电量**************************************************************/
+
+/*************************************************关系库**************************************************************/
+
+//
+//            Map<String, Double> gxkmap = new HashMap<>();
+//            List<Windpowerinfoday> wpdls = windpowerinfodayService.getWindpowerinfodayList(id, DateUtils.truncate(new Date()));
+//            if (!wpdls.isEmpty()) {
+//                Windpowerinfoday wd = wpdls.get(0);
+//                gxkmap.put("ndxkyss", wd.getYeardxkyxs());
+//                gxkmap.put("nsbklyl", wd.getYearsbklyl());
+//
+//                gxkmap.put("ydxkyss", wd.getMonthdxkyxs());
+//                gxkmap.put("ysbklyl", wd.getMonthsbklyl());
+//
+//            } else {
+//                gxkmap.put("ndxkyss", 0.0);
+//                gxkmap.put("nsbklyl", 0.0);
+//                gxkmap.put("ydxkyss", 0.0);
+//                gxkmap.put("ysbklyl", 0.0);
+//            }
+//            map.put("gxkmap", gxkmap);
+
+/*************************************************关系库指标**************************************************************/
+
+        }
+
+
+        return map;
+    }
+
+    /**
+     * 获得风场监视损失电量图表
+     * @param wpId
+     * @return
+     * @throws Exception
+     */
+    public List<DataVo> findLossWpBar(String wpId) throws Exception {
+        List<DataVo> vos = new ArrayList<DataVo>();
+        if (StringUtils.empty(wpId)) {
+            wpId = "0";
+        }
+
+        Calendar c = Calendar.getInstance();
+        c.set(Calendar.DAY_OF_MONTH, c.getActualMinimum(Calendar.DAY_OF_MONTH));
+        c.add(Calendar.DAY_OF_MONTH, 1);
+        // c.add(Calendar.MONTH, -1);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date beginDate = c.getTime();
+
+        c = Calendar.getInstance();
+        // c.add(Calendar.MONTH, -1);
+        c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+        c.add(Calendar.DAY_OF_MONTH, 1);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date endDate = c.getTime();
+        c = Calendar.getInstance();
+        long num = c.get(Calendar.DAY_OF_MONTH);
+        // long num = 30;
+
+
+
+
+        WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL);
+        WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL);
+
+        WindPowerStationTestingPoint2 gzssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL);
+        WindPowerStationTestingPoint2 jxssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL);
+
+        WindPowerStationTestingPoint2 djssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL);
+        WindPowerStationTestingPoint2 sdtjai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
+        WindPowerStationTestingPoint2 xnssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
+        WindPowerStationTestingPoint2 qxjclai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
+
+        WindPowerStationTestingPoint2 xdssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
+        WindPowerStationTestingPoint2 dwslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
+        WindPowerStationTestingPoint2 tqslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<PointData> gzslls = realApiUtil.getHistoryDatasSnap(gzslai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> jxslls = realApiUtil.getHistoryDatasSnap(jxslai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> gzssls = realApiUtil.getHistoryDatasSnap(gzssai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> jxssls = realApiUtil.getHistoryDatasSnap(jxssai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+
+        List<PointData> djssls = realApiUtil.getHistoryDatasSnap(djssai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> sdtjls = realApiUtil.getHistoryDatasSnap(sdtjai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> xnssls = realApiUtil.getHistoryDatasSnap(xnssai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> qxjclls = realApiUtil.getHistoryDatasSnap(qxjclai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+
+        List<PointData> xdssls = realApiUtil.getHistoryDatasSnap(xdssai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> dwslls = realApiUtil.getHistoryDatasSnap(dwslai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+        List<PointData> tqslls = realApiUtil.getHistoryDatasSnap(tqslai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+
+        if (!gzslls.isEmpty() && !jxslls.isEmpty() && !gzssls.isEmpty()
+                && !jxssls.isEmpty() && !djssls.isEmpty() && !sdtjls.isEmpty() && !xnssls.isEmpty()
+                && !qxjclls.isEmpty() && !xdssls.isEmpty() && !dwslls.isEmpty() && !tqslls.isEmpty()) {
+            Calendar cal = Calendar.getInstance();
+            int today = c.get(Calendar.DAY_OF_MONTH);
+            // int today = 30;
+            for (int i = 0; i < gzslls.size(); i++) {
+                DataVo vo = new DataVo();
+
+                Date date = new Date(gzslls.get(i).getPointTime() * 1000);
+                cal.setTime(date);
+
+                // vo.setTime(dateformat.parse(entry.getKey()).getTime());
+
+                if (i + 1 <= today) {
+                    vo.setTimestr(i + 1 + "日");
+                    //日待机损失
+                    Double rdjss = MathUtil.twoBit(djssls.get(i).getPointValueInDouble());
+                    //日手动停机损失
+                    Double rsdtjss = MathUtil.twoBit(sdtjls.get(i).getPointValueInDouble());
+                    //日性能损失
+                    Double rxnss = MathUtil.twoBit(xnssls.get(i).getPointValueInDouble());
+                    //日缺陷降出力损失
+                    Double rqxjclss = MathUtil.twoBit(qxjclls.get(i).getPointValueInDouble());
+
+                    //日欠发损失=日待机损失+日手动停机损失+日性能损失+日缺陷降出力损失
+                    Double xnss = new BigDecimal(rdjss + rsdtjss + rxnss + rqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    //日故障损失电量=日故障损失+日故障受累
+                    Double rgzsl = MathUtil.twoBit(gzslls.get(i).getPointValueInDouble());
+                    Double rgzss = MathUtil.twoBit(gzssls.get(i).getPointValueInDouble());
+                    Double gzss = new BigDecimal(rgzsl + rgzss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    //日检修损失电量=日检修损失+日检修受累
+                    Double rjxsl = MathUtil.twoBit(jxssls.get(i).getPointValueInDouble());
+                    Double rjxss = MathUtil.twoBit(jxslls.get(i).getPointValueInDouble());
+                    Double jxss = new BigDecimal(rjxss + rjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double xdxss = new BigDecimal(xdssls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    //受累损失电量=电网受累+天气受累
+                    Double dwslss =  new BigDecimal( dwslls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double twslss = new BigDecimal( tqslls.get(i).getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double slss = MathUtil.twoBit(dwslss+twslss);
+
+                    double ssdl=MathUtil.twoBit(xnss+gzss+jxss+xdxss+slss);
+                    vo.setValue1(ssdl);// 损失电量
+
+                } else {
+                    vo.setTimestr("");
+                    vo.setValue1(0.0);// 损失电量
+
+                    //vo.setSpeed(0.0);
+                }
+
+                vos.add(vo);
+            }
+        }
+
+        if (vos.size() < 31) {
+            for (int i = 0; i < 30; i++) {
+                DataVo vo = new DataVo();
+                vo.setTimestr("");
+
+                vo.setValue1(0.0);// 日发电量
+                vo.setValue2(0.0);// 上网电量
+                vo.setValue3(0.0);// 购网电量
+                // vo.setSpeed(0.0);
+                vos.add(vo);
+                if (vos.size() == 31) {
+                    break;
+                }
+            }
+        }
+
+        return vos;
+    }
+
+    /**
+     * 获得风场监视日发电量图表
+     * @param wpId
+     * @return
+     * @throws Exception
+     */
+    public List<DataVo> findPowerWpBar(String wpId) throws Exception {
+        List<DataVo> vos = new ArrayList<DataVo>();
+        if (StringUtils.empty(wpId)) {
+            wpId = "0";
+        }
+
+        Calendar c = Calendar.getInstance();
+
+        // c.add(Calendar.MONTH, -1);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date endDate = c.getTime();
+
+
+        c = Calendar.getInstance();
+        c.add(Calendar.DAY_OF_MONTH, -7);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date beginDate = c.getTime();
+        c = Calendar.getInstance();
+        long num = 7;
+        // long num = 30;
+
+
+
+
+        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<PointData> rfdlls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+
+        if (!rfdlls.isEmpty() ) {
+            Calendar cal = Calendar.getInstance();
+            int today = c.get(Calendar.DAY_OF_MONTH);
+            // int today = 30;
+            for (int i = 0; i < rfdlls.size(); i++) {
+                DataVo vo = new DataVo();
+
+                Date date = new Date(rfdlls.get(i).getPointTime() * 1000);
+                cal.setTime(date);
+
+                // vo.setTime(dateformat.parse(entry.getKey()).getTime());
+
+                vo.setTimestr(cal.get(Calendar.DAY_OF_MONTH) + "日");
+                //日发电量
+                Double rfdl = MathUtil.twoBit(rfdlls.get(i).getPointValueInDouble());
+                //日预测发电量
+                Double ycrfdl = MathUtil.twoBit(rfdl*1.06);
+
+                vos.add(vo);
+            }
+        }
+
+
+
+        return vos;
+    }
+    /**
+     * 获得风场监视月发电量图表
+     * @param wpId
+     * @return
+     * @throws Exception
+     */
+    public List<DataVo> findMonthPowerWpBar(String wpId) throws Exception {
+        List<DataVo> vos = new ArrayList<DataVo>();
+        if (StringUtils.empty(wpId)) {
+            wpId = "0";
+        }
+
+        Calendar c = Calendar.getInstance();
+
+        // c.add(Calendar.MONTH, -1);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date endDate = c.getTime();
+
+
+        c = Calendar.getInstance();
+        c.add(Calendar.DAY_OF_MONTH, -7);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date beginDate = c.getTime();
+        c = Calendar.getInstance();
+        long num = 7;
+        // long num = 30;
+
+
+
+
+        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
+
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<PointData> rfdlls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+
+        if (!rfdlls.isEmpty() ) {
+            Calendar cal = Calendar.getInstance();
+            int today = c.get(Calendar.DAY_OF_MONTH);
+            // int today = 30;
+            for (int i = 0; i < rfdlls.size(); i++) {
+                DataVo vo = new DataVo();
+
+                Date date = new Date(rfdlls.get(i).getPointTime() * 1000);
+                cal.setTime(date);
+
+                // vo.setTime(dateformat.parse(entry.getKey()).getTime());
+
+                vo.setTimestr(cal.get(Calendar.DAY_OF_MONTH) + "日");
+                //日发电量
+                Double rfdl = MathUtil.twoBit(rfdlls.get(i).getPointValueInDouble());
+                //日预测发电量
+                Double ycrfdl = MathUtil.twoBit(rfdl*1.06);
+
+                vo.setValue1(rfdl);// 日发电量
+                vo.setValue1(ycrfdl);// 日预测发电量
+
+                vos.add(vo);
+            }
+        }
+
+
+        return vos;
+    }
 }
 
 

Plik diff jest za duży
+ 452 - 368
src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java


+ 5 - 59
src/main/java/com/gyee/frame/service/websocket/WtWarnPushService.java

@@ -34,13 +34,11 @@ public class WtWarnPushService {
     public Map<String, Object> genreSetMap() throws Exception {
 
         Map<String, Object> map = new HashMap<>();
-
-        for(Windturbine wt:InitialRunner.wtls)
-        {
-            map.put(wt.getId(), findWtWarnInfo(wt.getId()));
-        }
-
- //       map.put("MG01_01", findWtWarnInfo("MG01_01"));
+        map.put("SG01_01", findWtWarnInfo("SG01_01"));
+        map.put("NG01_01", findWtWarnInfo("NG01_01"));
+        map.put("XG01_01", findWtWarnInfo("XG01_01"));
+        map.put("QG01_01", findWtWarnInfo("QG01_01"));
+       map.put("MG01_01", findWtWarnInfo("MG01_01"));
         return map;
 
     }
@@ -55,58 +53,6 @@ public class WtWarnPushService {
 
                 Windturbine wt = InitialRunner.wtmap.get(id);
 
-                Map<String, List<Warning2>> warnmap=InitialRunner.warnmodelmap.get(wt.getModelid());
-
-//                Set<Map.Entry<String, List<Warning2>>> set = warnmap.entrySet();
-//
-//                for (Iterator<Map.Entry<String, List<Warning2>>> it = set.iterator(); it.hasNext(); ) {
-//
-//                    Map.Entry<String, List<Warning2>> entry = (Map.Entry<String, List<Warning2>>) it.next();
-//
-//                    List<Warning2> warnls = entry.getValue();
-//
-//                    if (!warnls.isEmpty()) {
-//
-//                        if(!warnls.isEmpty())
-//                        {
-//                            List<String> unicodels = new ArrayList<>();
-//                            for(Warning2 wr :warnls)
-//                            {
-//                                StringBuilder sb = new StringBuilder();
-//                                sb.setLength(0);
-//                                sb.append("DI").append(wr.getEdnavalue());
-//                                unicodels.add(String.valueOf(sb));
-//                            }
-//
-//                            List<WindTurbineTestingPointDi2> list=windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id,unicodels);
-//                            if(!list.isEmpty())
-//                            {
-//                                List<ValueVo> vos = new ArrayList<>();
-//                                List<String> pointls = new ArrayList<>();
-//                                for(WindTurbineTestingPointDi2 di:list)
-//                                {
-//                                    pointls.add(di.getId());
-//                                    ValueVo vo = new ValueVo();
-//                                    vo.setName(di.getName());
-//                                    vos.add(vo);
-//                                }
-//                                List<PointData> pointlist = realApiUtil.getRealData(pointls);
-//
-//                                if (!pointlist.isEmpty() && pointlist.size() == pointls.size() && pointlist.size() == vos.size()) {
-//
-//                                    for (int i = 0; i < pointlist.size(); i++) {
-//
-//                                        vos.get(i).setData1(pointlist.get(i).getPointValueInDouble());
-//                                    }
-//                                }
-//                                map.put(entry.getKey(), vos);
-//                            }
-//
-//                        }
-//                    }
-//
-//                }
-
                 List<Warning2> warnls=InitialRunner.warnmap.get(wt.getModelid());
 
                 if (!warnls.isEmpty()) {

+ 10 - 1
src/main/resources/mybatis-generator.xml

@@ -106,7 +106,16 @@
 <!--        <table tableName='Equipment' domainObjectName='EquipmentSql'/>-->
 
 
-        <table tableName='stoptype' domainObjectName='Stoptype'/>
+        <table tableName='Wttragetreport3' domainObjectName='Wttragetreport3'/>
+        <table tableName='Wttragetreportchart3' domainObjectName='Wttragetreportchart3'/>
+        <table tableName='Wttragetreportfnlyl3' domainObjectName='Wttragetreportfnlyl3'/>
+
+        <table tableName='Wttragetreportkkxfx3' domainObjectName='Wttragetreportkkxfx3'/>
+        <table tableName='Wttragetreportmain3' domainObjectName='Wttragetreportmain3'/>
+        <table tableName='Wttragetreportpart3' domainObjectName='Wttragetreportpart3'/>
+
+        <table tableName='Wttragetreportxndjpj3' domainObjectName='Wttragetreportxndjpj3'/>
+        <table tableName='WtReportFault3' domainObjectName='WtReportFault3'/>
 
 
     </context>

+ 602 - 0
src/main/resources/mybatis/auto/WtReportFault3Mapper.xml

@@ -0,0 +1,602 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.WtReportFault3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WtReportFault3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="RECODEDATE" jdbcType="TIMESTAMP" property="recodedate" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="MAINREASON" jdbcType="VARCHAR" property="mainreason" />
+    <result column="MAINDATE" jdbcType="TIMESTAMP" property="maindate" />
+    <result column="SPEED" jdbcType="DECIMAL" property="speed" />
+    <result column="MAINMETHOD" jdbcType="VARCHAR" property="mainmethod" />
+    <result column="APPROACH" jdbcType="VARCHAR" property="approach" />
+    <result column="TOOLS" jdbcType="VARCHAR" property="tools" />
+    <result column="MAINHOUR" jdbcType="DECIMAL" property="mainhour" />
+    <result column="GZTOP1" jdbcType="DECIMAL" property="gztop1" />
+    <result column="GZTOP1NAME" jdbcType="VARCHAR" property="gztop1name" />
+    <result column="GZTOP2" jdbcType="DECIMAL" property="gztop2" />
+    <result column="GZTOP2NAME" jdbcType="VARCHAR" property="gztop2name" />
+    <result column="GZTOP3" jdbcType="DECIMAL" property="gztop3" />
+    <result column="GZTOP3NAME" jdbcType="VARCHAR" property="gztop3name" />
+    <result column="YJTOP1" jdbcType="DECIMAL" property="yjtop1" />
+    <result column="YJTOP1NAME" jdbcType="VARCHAR" property="yjtop1name" />
+    <result column="YJTOP2" jdbcType="DECIMAL" property="yjtop2" />
+    <result column="YJTOP2NAME" jdbcType="VARCHAR" property="yjtop2name" />
+    <result column="YJTOP3" jdbcType="DECIMAL" property="yjtop3" />
+    <result column="YJTOP3NAME" jdbcType="VARCHAR" property="yjtop3name" />
+    <result column="TOP1TYPE" jdbcType="VARCHAR" property="top1type" />
+    <result column="TOP2TYPE" jdbcType="VARCHAR" property="top2type" />
+    <result column="TOP3TYPE" jdbcType="VARCHAR" property="top3type" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, TID, RECODEDATE, WTID, MAINREASON, MAINDATE, SPEED, MAINMETHOD, APPROACH, TOOLS, 
+    MAINHOUR, GZTOP1, GZTOP1NAME, GZTOP2, GZTOP2NAME, GZTOP3, GZTOP3NAME, YJTOP1, YJTOP1NAME, 
+    YJTOP2, YJTOP2NAME, YJTOP3, YJTOP3NAME, TOP1TYPE, TOP2TYPE, TOP3TYPE
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WtReportFault3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTREPORTFAULT3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTREPORTFAULT3
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTREPORTFAULT3
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WtReportFault3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTREPORTFAULT3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.WtReportFault3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTREPORTFAULT3 (ID, TID, RECODEDATE, 
+      WTID, MAINREASON, MAINDATE, 
+      SPEED, MAINMETHOD, APPROACH, 
+      TOOLS, MAINHOUR, GZTOP1, 
+      GZTOP1NAME, GZTOP2, GZTOP2NAME, 
+      GZTOP3, GZTOP3NAME, YJTOP1, 
+      YJTOP1NAME, YJTOP2, YJTOP2NAME, 
+      YJTOP3, YJTOP3NAME, TOP1TYPE, 
+      TOP2TYPE, TOP3TYPE)
+    values (#{id,jdbcType=VARCHAR}, #{tid,jdbcType=DECIMAL}, #{recodedate,jdbcType=TIMESTAMP}, 
+      #{wtid,jdbcType=VARCHAR}, #{mainreason,jdbcType=VARCHAR}, #{maindate,jdbcType=TIMESTAMP}, 
+      #{speed,jdbcType=DECIMAL}, #{mainmethod,jdbcType=VARCHAR}, #{approach,jdbcType=VARCHAR}, 
+      #{tools,jdbcType=VARCHAR}, #{mainhour,jdbcType=DECIMAL}, #{gztop1,jdbcType=DECIMAL}, 
+      #{gztop1name,jdbcType=VARCHAR}, #{gztop2,jdbcType=DECIMAL}, #{gztop2name,jdbcType=VARCHAR}, 
+      #{gztop3,jdbcType=DECIMAL}, #{gztop3name,jdbcType=VARCHAR}, #{yjtop1,jdbcType=DECIMAL}, 
+      #{yjtop1name,jdbcType=VARCHAR}, #{yjtop2,jdbcType=DECIMAL}, #{yjtop2name,jdbcType=VARCHAR}, 
+      #{yjtop3,jdbcType=DECIMAL}, #{yjtop3name,jdbcType=VARCHAR}, #{top1type,jdbcType=VARCHAR}, 
+      #{top2type,jdbcType=VARCHAR}, #{top3type,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WtReportFault3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTREPORTFAULT3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="recodedate != null">
+        RECODEDATE,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="mainreason != null">
+        MAINREASON,
+      </if>
+      <if test="maindate != null">
+        MAINDATE,
+      </if>
+      <if test="speed != null">
+        SPEED,
+      </if>
+      <if test="mainmethod != null">
+        MAINMETHOD,
+      </if>
+      <if test="approach != null">
+        APPROACH,
+      </if>
+      <if test="tools != null">
+        TOOLS,
+      </if>
+      <if test="mainhour != null">
+        MAINHOUR,
+      </if>
+      <if test="gztop1 != null">
+        GZTOP1,
+      </if>
+      <if test="gztop1name != null">
+        GZTOP1NAME,
+      </if>
+      <if test="gztop2 != null">
+        GZTOP2,
+      </if>
+      <if test="gztop2name != null">
+        GZTOP2NAME,
+      </if>
+      <if test="gztop3 != null">
+        GZTOP3,
+      </if>
+      <if test="gztop3name != null">
+        GZTOP3NAME,
+      </if>
+      <if test="yjtop1 != null">
+        YJTOP1,
+      </if>
+      <if test="yjtop1name != null">
+        YJTOP1NAME,
+      </if>
+      <if test="yjtop2 != null">
+        YJTOP2,
+      </if>
+      <if test="yjtop2name != null">
+        YJTOP2NAME,
+      </if>
+      <if test="yjtop3 != null">
+        YJTOP3,
+      </if>
+      <if test="yjtop3name != null">
+        YJTOP3NAME,
+      </if>
+      <if test="top1type != null">
+        TOP1TYPE,
+      </if>
+      <if test="top2type != null">
+        TOP2TYPE,
+      </if>
+      <if test="top3type != null">
+        TOP3TYPE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="recodedate != null">
+        #{recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="mainreason != null">
+        #{mainreason,jdbcType=VARCHAR},
+      </if>
+      <if test="maindate != null">
+        #{maindate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="speed != null">
+        #{speed,jdbcType=DECIMAL},
+      </if>
+      <if test="mainmethod != null">
+        #{mainmethod,jdbcType=VARCHAR},
+      </if>
+      <if test="approach != null">
+        #{approach,jdbcType=VARCHAR},
+      </if>
+      <if test="tools != null">
+        #{tools,jdbcType=VARCHAR},
+      </if>
+      <if test="mainhour != null">
+        #{mainhour,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop1 != null">
+        #{gztop1,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop1name != null">
+        #{gztop1name,jdbcType=VARCHAR},
+      </if>
+      <if test="gztop2 != null">
+        #{gztop2,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop2name != null">
+        #{gztop2name,jdbcType=VARCHAR},
+      </if>
+      <if test="gztop3 != null">
+        #{gztop3,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop3name != null">
+        #{gztop3name,jdbcType=VARCHAR},
+      </if>
+      <if test="yjtop1 != null">
+        #{yjtop1,jdbcType=DECIMAL},
+      </if>
+      <if test="yjtop1name != null">
+        #{yjtop1name,jdbcType=VARCHAR},
+      </if>
+      <if test="yjtop2 != null">
+        #{yjtop2,jdbcType=DECIMAL},
+      </if>
+      <if test="yjtop2name != null">
+        #{yjtop2name,jdbcType=VARCHAR},
+      </if>
+      <if test="yjtop3 != null">
+        #{yjtop3,jdbcType=DECIMAL},
+      </if>
+      <if test="yjtop3name != null">
+        #{yjtop3name,jdbcType=VARCHAR},
+      </if>
+      <if test="top1type != null">
+        #{top1type,jdbcType=VARCHAR},
+      </if>
+      <if test="top2type != null">
+        #{top2type,jdbcType=VARCHAR},
+      </if>
+      <if test="top3type != null">
+        #{top3type,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WtReportFault3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTREPORTFAULT3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTREPORTFAULT3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.recodedate != null">
+        RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mainreason != null">
+        MAINREASON = #{record.mainreason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.maindate != null">
+        MAINDATE = #{record.maindate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.speed != null">
+        SPEED = #{record.speed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.mainmethod != null">
+        MAINMETHOD = #{record.mainmethod,jdbcType=VARCHAR},
+      </if>
+      <if test="record.approach != null">
+        APPROACH = #{record.approach,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tools != null">
+        TOOLS = #{record.tools,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mainhour != null">
+        MAINHOUR = #{record.mainhour,jdbcType=DECIMAL},
+      </if>
+      <if test="record.gztop1 != null">
+        GZTOP1 = #{record.gztop1,jdbcType=DECIMAL},
+      </if>
+      <if test="record.gztop1name != null">
+        GZTOP1NAME = #{record.gztop1name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gztop2 != null">
+        GZTOP2 = #{record.gztop2,jdbcType=DECIMAL},
+      </if>
+      <if test="record.gztop2name != null">
+        GZTOP2NAME = #{record.gztop2name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gztop3 != null">
+        GZTOP3 = #{record.gztop3,jdbcType=DECIMAL},
+      </if>
+      <if test="record.gztop3name != null">
+        GZTOP3NAME = #{record.gztop3name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yjtop1 != null">
+        YJTOP1 = #{record.yjtop1,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yjtop1name != null">
+        YJTOP1NAME = #{record.yjtop1name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yjtop2 != null">
+        YJTOP2 = #{record.yjtop2,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yjtop2name != null">
+        YJTOP2NAME = #{record.yjtop2name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yjtop3 != null">
+        YJTOP3 = #{record.yjtop3,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yjtop3name != null">
+        YJTOP3NAME = #{record.yjtop3name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.top1type != null">
+        TOP1TYPE = #{record.top1type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.top2type != null">
+        TOP2TYPE = #{record.top2type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.top3type != null">
+        TOP3TYPE = #{record.top3type,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTREPORTFAULT3
+    set ID = #{record.id,jdbcType=VARCHAR},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      MAINREASON = #{record.mainreason,jdbcType=VARCHAR},
+      MAINDATE = #{record.maindate,jdbcType=TIMESTAMP},
+      SPEED = #{record.speed,jdbcType=DECIMAL},
+      MAINMETHOD = #{record.mainmethod,jdbcType=VARCHAR},
+      APPROACH = #{record.approach,jdbcType=VARCHAR},
+      TOOLS = #{record.tools,jdbcType=VARCHAR},
+      MAINHOUR = #{record.mainhour,jdbcType=DECIMAL},
+      GZTOP1 = #{record.gztop1,jdbcType=DECIMAL},
+      GZTOP1NAME = #{record.gztop1name,jdbcType=VARCHAR},
+      GZTOP2 = #{record.gztop2,jdbcType=DECIMAL},
+      GZTOP2NAME = #{record.gztop2name,jdbcType=VARCHAR},
+      GZTOP3 = #{record.gztop3,jdbcType=DECIMAL},
+      GZTOP3NAME = #{record.gztop3name,jdbcType=VARCHAR},
+      YJTOP1 = #{record.yjtop1,jdbcType=DECIMAL},
+      YJTOP1NAME = #{record.yjtop1name,jdbcType=VARCHAR},
+      YJTOP2 = #{record.yjtop2,jdbcType=DECIMAL},
+      YJTOP2NAME = #{record.yjtop2name,jdbcType=VARCHAR},
+      YJTOP3 = #{record.yjtop3,jdbcType=DECIMAL},
+      YJTOP3NAME = #{record.yjtop3name,jdbcType=VARCHAR},
+      TOP1TYPE = #{record.top1type,jdbcType=VARCHAR},
+      TOP2TYPE = #{record.top2type,jdbcType=VARCHAR},
+      TOP3TYPE = #{record.top3type,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WtReportFault3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTREPORTFAULT3
+    <set>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="recodedate != null">
+        RECODEDATE = #{recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="mainreason != null">
+        MAINREASON = #{mainreason,jdbcType=VARCHAR},
+      </if>
+      <if test="maindate != null">
+        MAINDATE = #{maindate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="speed != null">
+        SPEED = #{speed,jdbcType=DECIMAL},
+      </if>
+      <if test="mainmethod != null">
+        MAINMETHOD = #{mainmethod,jdbcType=VARCHAR},
+      </if>
+      <if test="approach != null">
+        APPROACH = #{approach,jdbcType=VARCHAR},
+      </if>
+      <if test="tools != null">
+        TOOLS = #{tools,jdbcType=VARCHAR},
+      </if>
+      <if test="mainhour != null">
+        MAINHOUR = #{mainhour,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop1 != null">
+        GZTOP1 = #{gztop1,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop1name != null">
+        GZTOP1NAME = #{gztop1name,jdbcType=VARCHAR},
+      </if>
+      <if test="gztop2 != null">
+        GZTOP2 = #{gztop2,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop2name != null">
+        GZTOP2NAME = #{gztop2name,jdbcType=VARCHAR},
+      </if>
+      <if test="gztop3 != null">
+        GZTOP3 = #{gztop3,jdbcType=DECIMAL},
+      </if>
+      <if test="gztop3name != null">
+        GZTOP3NAME = #{gztop3name,jdbcType=VARCHAR},
+      </if>
+      <if test="yjtop1 != null">
+        YJTOP1 = #{yjtop1,jdbcType=DECIMAL},
+      </if>
+      <if test="yjtop1name != null">
+        YJTOP1NAME = #{yjtop1name,jdbcType=VARCHAR},
+      </if>
+      <if test="yjtop2 != null">
+        YJTOP2 = #{yjtop2,jdbcType=DECIMAL},
+      </if>
+      <if test="yjtop2name != null">
+        YJTOP2NAME = #{yjtop2name,jdbcType=VARCHAR},
+      </if>
+      <if test="yjtop3 != null">
+        YJTOP3 = #{yjtop3,jdbcType=DECIMAL},
+      </if>
+      <if test="yjtop3name != null">
+        YJTOP3NAME = #{yjtop3name,jdbcType=VARCHAR},
+      </if>
+      <if test="top1type != null">
+        TOP1TYPE = #{top1type,jdbcType=VARCHAR},
+      </if>
+      <if test="top2type != null">
+        TOP2TYPE = #{top2type,jdbcType=VARCHAR},
+      </if>
+      <if test="top3type != null">
+        TOP3TYPE = #{top3type,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WtReportFault3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTREPORTFAULT3
+    set TID = #{tid,jdbcType=DECIMAL},
+      RECODEDATE = #{recodedate,jdbcType=TIMESTAMP},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      MAINREASON = #{mainreason,jdbcType=VARCHAR},
+      MAINDATE = #{maindate,jdbcType=TIMESTAMP},
+      SPEED = #{speed,jdbcType=DECIMAL},
+      MAINMETHOD = #{mainmethod,jdbcType=VARCHAR},
+      APPROACH = #{approach,jdbcType=VARCHAR},
+      TOOLS = #{tools,jdbcType=VARCHAR},
+      MAINHOUR = #{mainhour,jdbcType=DECIMAL},
+      GZTOP1 = #{gztop1,jdbcType=DECIMAL},
+      GZTOP1NAME = #{gztop1name,jdbcType=VARCHAR},
+      GZTOP2 = #{gztop2,jdbcType=DECIMAL},
+      GZTOP2NAME = #{gztop2name,jdbcType=VARCHAR},
+      GZTOP3 = #{gztop3,jdbcType=DECIMAL},
+      GZTOP3NAME = #{gztop3name,jdbcType=VARCHAR},
+      YJTOP1 = #{yjtop1,jdbcType=DECIMAL},
+      YJTOP1NAME = #{yjtop1name,jdbcType=VARCHAR},
+      YJTOP2 = #{yjtop2,jdbcType=DECIMAL},
+      YJTOP2NAME = #{yjtop2name,jdbcType=VARCHAR},
+      YJTOP3 = #{yjtop3,jdbcType=DECIMAL},
+      YJTOP3NAME = #{yjtop3name,jdbcType=VARCHAR},
+      TOP1TYPE = #{top1type,jdbcType=VARCHAR},
+      TOP2TYPE = #{top2type,jdbcType=VARCHAR},
+      TOP3TYPE = #{top3type,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 271 - 0
src/main/resources/mybatis/auto/Wttragetreport3Mapper.xml

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreport3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreport3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="RECODEDATE" jdbcType="TIMESTAMP" property="recodedate" />
+    <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />
+    <result column="YEAR" jdbcType="DECIMAL" property="year" />
+    <result column="MONTH" jdbcType="DECIMAL" property="month" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, RECODEDATE, CREATEDATE, YEAR, MONTH
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreport3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORT3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORT3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORT3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreport3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORT3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreport3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORT3 (ID, RECODEDATE, CREATEDATE, 
+      YEAR, MONTH)
+    values (#{id,jdbcType=DECIMAL}, #{recodedate,jdbcType=TIMESTAMP}, #{createdate,jdbcType=TIMESTAMP}, 
+      #{year,jdbcType=DECIMAL}, #{month,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreport3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORT3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="recodedate != null">
+        RECODEDATE,
+      </if>
+      <if test="createdate != null">
+        CREATEDATE,
+      </if>
+      <if test="year != null">
+        YEAR,
+      </if>
+      <if test="month != null">
+        MONTH,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="recodedate != null">
+        #{recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdate != null">
+        #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="year != null">
+        #{year,jdbcType=DECIMAL},
+      </if>
+      <if test="month != null">
+        #{month,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreport3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORT3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORT3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.recodedate != null">
+        RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createdate != null">
+        CREATEDATE = #{record.createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.year != null">
+        YEAR = #{record.year,jdbcType=DECIMAL},
+      </if>
+      <if test="record.month != null">
+        MONTH = #{record.month,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORT3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
+      CREATEDATE = #{record.createdate,jdbcType=TIMESTAMP},
+      YEAR = #{record.year,jdbcType=DECIMAL},
+      MONTH = #{record.month,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreport3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORT3
+    <set>
+      <if test="recodedate != null">
+        RECODEDATE = #{recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdate != null">
+        CREATEDATE = #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="year != null">
+        YEAR = #{year,jdbcType=DECIMAL},
+      </if>
+      <if test="month != null">
+        MONTH = #{month,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreport3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORT3
+    set RECODEDATE = #{recodedate,jdbcType=TIMESTAMP},
+      CREATEDATE = #{createdate,jdbcType=TIMESTAMP},
+      YEAR = #{year,jdbcType=DECIMAL},
+      MONTH = #{month,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 335 - 0
src/main/resources/mybatis/auto/Wttragetreportchart3Mapper.xml

@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreportchart3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreportchart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="PARTID" jdbcType="VARCHAR" property="partid" />
+    <result column="PARTNAME" jdbcType="VARCHAR" property="partname" />
+    <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="VALUE" jdbcType="DECIMAL" property="value" />
+    <result column="PARENTID" jdbcType="VARCHAR" property="parentid" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WTNAME" jdbcType="VARCHAR" property="wtname" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, TID, PARTID, PARTNAME, RECORDDATE, VALUE, PARENTID, WTID, WTNAME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTCHART3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTCHART3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTCHART3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTCHART3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTCHART3 (ID, TID, PARTID, 
+      PARTNAME, RECORDDATE, VALUE, 
+      PARENTID, WTID, WTNAME
+      )
+    values (#{id,jdbcType=DECIMAL}, #{tid,jdbcType=DECIMAL}, #{partid,jdbcType=VARCHAR}, 
+      #{partname,jdbcType=VARCHAR}, #{recorddate,jdbcType=TIMESTAMP}, #{value,jdbcType=DECIMAL}, 
+      #{parentid,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, #{wtname,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTCHART3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="partid != null">
+        PARTID,
+      </if>
+      <if test="partname != null">
+        PARTNAME,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="value != null">
+        VALUE,
+      </if>
+      <if test="parentid != null">
+        PARENTID,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wtname != null">
+        WTNAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="partid != null">
+        #{partid,jdbcType=VARCHAR},
+      </if>
+      <if test="partname != null">
+        #{partname,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=DECIMAL},
+      </if>
+      <if test="parentid != null">
+        #{parentid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        #{wtname,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORTCHART3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTCHART3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.partid != null">
+        PARTID = #{record.partid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.partname != null">
+        PARTNAME = #{record.partname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.value != null">
+        VALUE = #{record.value,jdbcType=DECIMAL},
+      </if>
+      <if test="record.parentid != null">
+        PARENTID = #{record.parentid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtname != null">
+        WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTCHART3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      PARTID = #{record.partid,jdbcType=VARCHAR},
+      PARTNAME = #{record.partname,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      VALUE = #{record.value,jdbcType=DECIMAL},
+      PARENTID = #{record.parentid,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WTNAME = #{record.wtname,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTCHART3
+    <set>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="partid != null">
+        PARTID = #{partid,jdbcType=VARCHAR},
+      </if>
+      <if test="partname != null">
+        PARTNAME = #{partname,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="value != null">
+        VALUE = #{value,jdbcType=DECIMAL},
+      </if>
+      <if test="parentid != null">
+        PARENTID = #{parentid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        WTNAME = #{wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreportchart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTCHART3
+    set TID = #{tid,jdbcType=DECIMAL},
+      PARTID = #{partid,jdbcType=VARCHAR},
+      PARTNAME = #{partname,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      VALUE = #{value,jdbcType=DECIMAL},
+      PARENTID = #{parentid,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      WTNAME = #{wtname,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 397 - 0
src/main/resources/mybatis/auto/Wttragetreportfnlyl3Mapper.xml

@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreportfnlyl3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreportfnlyl3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="Q3YSJ" jdbcType="DECIMAL" property="q3ysj" />
+    <result column="Q2YSJ" jdbcType="DECIMAL" property="q2ysj" />
+    <result column="Q1YSJ" jdbcType="DECIMAL" property="q1ysj" />
+    <result column="YTBZ" jdbcType="DECIMAL" property="ytbz" />
+    <result column="YTBQS" jdbcType="VARCHAR" property="ytbqs" />
+    <result column="YHBZ" jdbcType="DECIMAL" property="yhbz" />
+    <result column="YHBQS" jdbcType="VARCHAR" property="yhbqs" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WTNAME" jdbcType="VARCHAR" property="wtname" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, TID, NAME, RECORDDATE, Q3YSJ, Q2YSJ, Q1YSJ, YTBZ, YTBQS, YHBZ, YHBQS, WTID, WTNAME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTFNLYL3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTFNLYL3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTFNLYL3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTFNLYL3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTFNLYL3 (ID, TID, NAME, 
+      RECORDDATE, Q3YSJ, Q2YSJ, 
+      Q1YSJ, YTBZ, YTBQS, 
+      YHBZ, YHBQS, WTID, 
+      WTNAME)
+    values (#{id,jdbcType=DECIMAL}, #{tid,jdbcType=DECIMAL}, #{name,jdbcType=VARCHAR}, 
+      #{recorddate,jdbcType=TIMESTAMP}, #{q3ysj,jdbcType=DECIMAL}, #{q2ysj,jdbcType=DECIMAL}, 
+      #{q1ysj,jdbcType=DECIMAL}, #{ytbz,jdbcType=DECIMAL}, #{ytbqs,jdbcType=VARCHAR}, 
+      #{yhbz,jdbcType=DECIMAL}, #{yhbqs,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, 
+      #{wtname,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTFNLYL3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="q3ysj != null">
+        Q3YSJ,
+      </if>
+      <if test="q2ysj != null">
+        Q2YSJ,
+      </if>
+      <if test="q1ysj != null">
+        Q1YSJ,
+      </if>
+      <if test="ytbz != null">
+        YTBZ,
+      </if>
+      <if test="ytbqs != null">
+        YTBQS,
+      </if>
+      <if test="yhbz != null">
+        YHBZ,
+      </if>
+      <if test="yhbqs != null">
+        YHBQS,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wtname != null">
+        WTNAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3ysj != null">
+        #{q3ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q2ysj != null">
+        #{q2ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q1ysj != null">
+        #{q1ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbz != null">
+        #{ytbz,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbqs != null">
+        #{ytbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="yhbz != null">
+        #{yhbz,jdbcType=DECIMAL},
+      </if>
+      <if test="yhbqs != null">
+        #{yhbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        #{wtname,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORTFNLYL3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTFNLYL3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.q3ysj != null">
+        Q3YSJ = #{record.q3ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.q2ysj != null">
+        Q2YSJ = #{record.q2ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.q1ysj != null">
+        Q1YSJ = #{record.q1ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ytbz != null">
+        YTBZ = #{record.ytbz,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ytbqs != null">
+        YTBQS = #{record.ytbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhbz != null">
+        YHBZ = #{record.yhbz,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yhbqs != null">
+        YHBQS = #{record.yhbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtname != null">
+        WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTFNLYL3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      Q3YSJ = #{record.q3ysj,jdbcType=DECIMAL},
+      Q2YSJ = #{record.q2ysj,jdbcType=DECIMAL},
+      Q1YSJ = #{record.q1ysj,jdbcType=DECIMAL},
+      YTBZ = #{record.ytbz,jdbcType=DECIMAL},
+      YTBQS = #{record.ytbqs,jdbcType=VARCHAR},
+      YHBZ = #{record.yhbz,jdbcType=DECIMAL},
+      YHBQS = #{record.yhbqs,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WTNAME = #{record.wtname,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTFNLYL3
+    <set>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3ysj != null">
+        Q3YSJ = #{q3ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q2ysj != null">
+        Q2YSJ = #{q2ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q1ysj != null">
+        Q1YSJ = #{q1ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbz != null">
+        YTBZ = #{ytbz,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbqs != null">
+        YTBQS = #{ytbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="yhbz != null">
+        YHBZ = #{yhbz,jdbcType=DECIMAL},
+      </if>
+      <if test="yhbqs != null">
+        YHBQS = #{yhbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        WTNAME = #{wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreportfnlyl3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTFNLYL3
+    set TID = #{tid,jdbcType=DECIMAL},
+      NAME = #{name,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      Q3YSJ = #{q3ysj,jdbcType=DECIMAL},
+      Q2YSJ = #{q2ysj,jdbcType=DECIMAL},
+      Q1YSJ = #{q1ysj,jdbcType=DECIMAL},
+      YTBZ = #{ytbz,jdbcType=DECIMAL},
+      YTBQS = #{ytbqs,jdbcType=VARCHAR},
+      YHBZ = #{yhbz,jdbcType=DECIMAL},
+      YHBQS = #{yhbqs,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      WTNAME = #{wtname,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 397 - 0
src/main/resources/mybatis/auto/Wttragetreportkkxfx3Mapper.xml

@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreportkkxfx3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreportkkxfx3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="Q3YSJ" jdbcType="DECIMAL" property="q3ysj" />
+    <result column="Q2YSJ" jdbcType="DECIMAL" property="q2ysj" />
+    <result column="Q1YSJ" jdbcType="DECIMAL" property="q1ysj" />
+    <result column="YTBZ" jdbcType="DECIMAL" property="ytbz" />
+    <result column="YTBQS" jdbcType="VARCHAR" property="ytbqs" />
+    <result column="YHBZ" jdbcType="DECIMAL" property="yhbz" />
+    <result column="YHBQS" jdbcType="VARCHAR" property="yhbqs" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WTNAME" jdbcType="VARCHAR" property="wtname" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, TID, NAME, RECORDDATE, Q3YSJ, Q2YSJ, Q1YSJ, YTBZ, YTBQS, YHBZ, YHBQS, WTID, WTNAME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTKKXFX3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTKKXFX3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTKKXFX3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTKKXFX3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTKKXFX3 (ID, TID, NAME, 
+      RECORDDATE, Q3YSJ, Q2YSJ, 
+      Q1YSJ, YTBZ, YTBQS, 
+      YHBZ, YHBQS, WTID, 
+      WTNAME)
+    values (#{id,jdbcType=DECIMAL}, #{tid,jdbcType=DECIMAL}, #{name,jdbcType=VARCHAR}, 
+      #{recorddate,jdbcType=TIMESTAMP}, #{q3ysj,jdbcType=DECIMAL}, #{q2ysj,jdbcType=DECIMAL}, 
+      #{q1ysj,jdbcType=DECIMAL}, #{ytbz,jdbcType=DECIMAL}, #{ytbqs,jdbcType=VARCHAR}, 
+      #{yhbz,jdbcType=DECIMAL}, #{yhbqs,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, 
+      #{wtname,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTKKXFX3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="q3ysj != null">
+        Q3YSJ,
+      </if>
+      <if test="q2ysj != null">
+        Q2YSJ,
+      </if>
+      <if test="q1ysj != null">
+        Q1YSJ,
+      </if>
+      <if test="ytbz != null">
+        YTBZ,
+      </if>
+      <if test="ytbqs != null">
+        YTBQS,
+      </if>
+      <if test="yhbz != null">
+        YHBZ,
+      </if>
+      <if test="yhbqs != null">
+        YHBQS,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wtname != null">
+        WTNAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3ysj != null">
+        #{q3ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q2ysj != null">
+        #{q2ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q1ysj != null">
+        #{q1ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbz != null">
+        #{ytbz,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbqs != null">
+        #{ytbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="yhbz != null">
+        #{yhbz,jdbcType=DECIMAL},
+      </if>
+      <if test="yhbqs != null">
+        #{yhbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        #{wtname,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORTKKXFX3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTKKXFX3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.q3ysj != null">
+        Q3YSJ = #{record.q3ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.q2ysj != null">
+        Q2YSJ = #{record.q2ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.q1ysj != null">
+        Q1YSJ = #{record.q1ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ytbz != null">
+        YTBZ = #{record.ytbz,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ytbqs != null">
+        YTBQS = #{record.ytbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhbz != null">
+        YHBZ = #{record.yhbz,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yhbqs != null">
+        YHBQS = #{record.yhbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtname != null">
+        WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTKKXFX3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      Q3YSJ = #{record.q3ysj,jdbcType=DECIMAL},
+      Q2YSJ = #{record.q2ysj,jdbcType=DECIMAL},
+      Q1YSJ = #{record.q1ysj,jdbcType=DECIMAL},
+      YTBZ = #{record.ytbz,jdbcType=DECIMAL},
+      YTBQS = #{record.ytbqs,jdbcType=VARCHAR},
+      YHBZ = #{record.yhbz,jdbcType=DECIMAL},
+      YHBQS = #{record.yhbqs,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WTNAME = #{record.wtname,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTKKXFX3
+    <set>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3ysj != null">
+        Q3YSJ = #{q3ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q2ysj != null">
+        Q2YSJ = #{q2ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="q1ysj != null">
+        Q1YSJ = #{q1ysj,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbz != null">
+        YTBZ = #{ytbz,jdbcType=DECIMAL},
+      </if>
+      <if test="ytbqs != null">
+        YTBQS = #{ytbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="yhbz != null">
+        YHBZ = #{yhbz,jdbcType=DECIMAL},
+      </if>
+      <if test="yhbqs != null">
+        YHBQS = #{yhbqs,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        WTNAME = #{wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreportkkxfx3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTKKXFX3
+    set TID = #{tid,jdbcType=DECIMAL},
+      NAME = #{name,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      Q3YSJ = #{q3ysj,jdbcType=DECIMAL},
+      Q2YSJ = #{q2ysj,jdbcType=DECIMAL},
+      Q1YSJ = #{q1ysj,jdbcType=DECIMAL},
+      YTBZ = #{ytbz,jdbcType=DECIMAL},
+      YTBQS = #{ytbqs,jdbcType=VARCHAR},
+      YHBZ = #{yhbz,jdbcType=DECIMAL},
+      YHBQS = #{yhbqs,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      WTNAME = #{wtname,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 965 - 0
src/main/resources/mybatis/auto/Wttragetreportmain3Mapper.xml

@@ -0,0 +1,965 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreportmain3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreportmain3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="RECODEDATE" jdbcType="TIMESTAMP" property="recodedate" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WTNAME" jdbcType="VARCHAR" property="wtname" />
+    <result column="PJDJ" jdbcType="VARCHAR" property="pjdj" />
+    <result column="PJJG" jdbcType="VARCHAR" property="pjjg" />
+    <result column="YFDL" jdbcType="DECIMAL" property="yfdl" />
+    <result column="BWSJ" jdbcType="TIMESTAMP" property="bwsj" />
+    <result column="NFDL" jdbcType="DECIMAL" property="nfdl" />
+    <result column="YFDLHB" jdbcType="DECIMAL" property="yfdlhb" />
+    <result column="YFDLTB" jdbcType="DECIMAL" property="yfdltb" />
+    <result column="YGZCS" jdbcType="DECIMAL" property="ygzcs" />
+    <result column="YGZSC" jdbcType="DECIMAL" property="ygzsc" />
+    <result column="BGSCRY" jdbcType="VARCHAR" property="bgscry" />
+    <result column="BGSJ" jdbcType="TIMESTAMP" property="bgsj" />
+    <result column="FDLGZCS" jdbcType="DECIMAL" property="fdlgzcs" />
+    <result column="FDLBJCS" jdbcType="DECIMAL" property="fdlbjcs" />
+    <result column="FDLJKQK" jdbcType="VARCHAR" property="fdljkqk" />
+    <result column="CLXGZCS" jdbcType="DECIMAL" property="clxgzcs" />
+    <result column="CLXBJCS" jdbcType="DECIMAL" property="clxbjcs" />
+    <result column="CLXJKQK" jdbcType="VARCHAR" property="clxjkqk" />
+    <result column="BJGZCS" jdbcType="DECIMAL" property="bjgzcs" />
+    <result column="BJBJCS" jdbcType="DECIMAL" property="bjbjcs" />
+    <result column="BJJKQK" jdbcType="VARCHAR" property="bjjkqk" />
+    <result column="ZKGZCS" jdbcType="DECIMAL" property="zkgzcs" />
+    <result column="ZKBJCS" jdbcType="DECIMAL" property="zkbjcs" />
+    <result column="ZKJKQK" jdbcType="VARCHAR" property="zkjkqk" />
+    <result column="LLFDL" jdbcType="DECIMAL" property="llfdl" />
+    <result column="PJGL" jdbcType="DECIMAL" property="pjgl" />
+    <result column="GZSSDL" jdbcType="DECIMAL" property="gzssdl" />
+    <result column="XDSSDLL" jdbcType="DECIMAL" property="xdssdll" />
+    <result column="WHSSDL" jdbcType="DECIMAL" property="whssdl" />
+    <result column="GZSJ" jdbcType="DECIMAL" property="gzsj" />
+    <result column="WHSJ" jdbcType="DECIMAL" property="whsj" />
+    <result column="YXSJ" jdbcType="DECIMAL" property="yxsj" />
+    <result column="TJSJ" jdbcType="DECIMAL" property="tjsj" />
+    <result column="PJQRFS" jdbcType="DECIMAL" property="pjqrfs" />
+    <result column="XNSSDL" jdbcType="DECIMAL" property="xnssdl" />
+    <result column="NHYD" jdbcType="DECIMAL" property="nhyd" />
+    <result column="GLYZXXS" jdbcType="DECIMAL" property="glyzxxs" />
+    <result column="LYXS" jdbcType="DECIMAL" property="lyxs" />
+    <result column="SBKLYL" jdbcType="DECIMAL" property="sbklyl" />
+    <result column="DXKLYXS" jdbcType="DECIMAL" property="dxklyxs" />
+    <result column="YXFSS" jdbcType="DECIMAL" property="yxfss" />
+    <result column="PJFS" jdbcType="DECIMAL" property="pjfs" />
+    <result column="JFPL" jdbcType="DECIMAL" property="jfpl" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="WL1TXNQK" jdbcType="VARCHAR" property="wl1txnqk" />
+    <result column="WL3TXNQK" jdbcType="VARCHAR" property="wl3txnqk" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, RECODEDATE, WTID, WTNAME, PJDJ, PJJG, YFDL, BWSJ, NFDL, YFDLHB, YFDLTB, YGZCS, 
+    YGZSC, BGSCRY, BGSJ, FDLGZCS, FDLBJCS, FDLJKQK, CLXGZCS, CLXBJCS, CLXJKQK, BJGZCS, 
+    BJBJCS, BJJKQK, ZKGZCS, ZKBJCS, ZKJKQK, LLFDL, PJGL, GZSSDL, XDSSDLL, WHSSDL, GZSJ, 
+    WHSJ, YXSJ, TJSJ, PJQRFS, XNSSDL, NHYD, GLYZXXS, LYXS, SBKLYL, DXKLYXS, YXFSS, PJFS, 
+    JFPL, TID, WL1TXNQK, WL3TXNQK
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTMAIN3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTMAIN3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTMAIN3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTMAIN3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTMAIN3 (ID, RECODEDATE, WTID, 
+      WTNAME, PJDJ, PJJG, 
+      YFDL, BWSJ, NFDL, 
+      YFDLHB, YFDLTB, YGZCS, 
+      YGZSC, BGSCRY, BGSJ, 
+      FDLGZCS, FDLBJCS, FDLJKQK, 
+      CLXGZCS, CLXBJCS, CLXJKQK, 
+      BJGZCS, BJBJCS, BJJKQK, 
+      ZKGZCS, ZKBJCS, ZKJKQK, 
+      LLFDL, PJGL, GZSSDL, 
+      XDSSDLL, WHSSDL, GZSJ, 
+      WHSJ, YXSJ, TJSJ, PJQRFS, 
+      XNSSDL, NHYD, GLYZXXS, 
+      LYXS, SBKLYL, DXKLYXS, 
+      YXFSS, PJFS, JFPL, 
+      TID, WL1TXNQK, WL3TXNQK
+      )
+    values (#{id,jdbcType=DECIMAL}, #{recodedate,jdbcType=TIMESTAMP}, #{wtid,jdbcType=VARCHAR}, 
+      #{wtname,jdbcType=VARCHAR}, #{pjdj,jdbcType=VARCHAR}, #{pjjg,jdbcType=VARCHAR}, 
+      #{yfdl,jdbcType=DECIMAL}, #{bwsj,jdbcType=TIMESTAMP}, #{nfdl,jdbcType=DECIMAL}, 
+      #{yfdlhb,jdbcType=DECIMAL}, #{yfdltb,jdbcType=DECIMAL}, #{ygzcs,jdbcType=DECIMAL}, 
+      #{ygzsc,jdbcType=DECIMAL}, #{bgscry,jdbcType=VARCHAR}, #{bgsj,jdbcType=TIMESTAMP}, 
+      #{fdlgzcs,jdbcType=DECIMAL}, #{fdlbjcs,jdbcType=DECIMAL}, #{fdljkqk,jdbcType=VARCHAR}, 
+      #{clxgzcs,jdbcType=DECIMAL}, #{clxbjcs,jdbcType=DECIMAL}, #{clxjkqk,jdbcType=VARCHAR}, 
+      #{bjgzcs,jdbcType=DECIMAL}, #{bjbjcs,jdbcType=DECIMAL}, #{bjjkqk,jdbcType=VARCHAR}, 
+      #{zkgzcs,jdbcType=DECIMAL}, #{zkbjcs,jdbcType=DECIMAL}, #{zkjkqk,jdbcType=VARCHAR}, 
+      #{llfdl,jdbcType=DECIMAL}, #{pjgl,jdbcType=DECIMAL}, #{gzssdl,jdbcType=DECIMAL}, 
+      #{xdssdll,jdbcType=DECIMAL}, #{whssdl,jdbcType=DECIMAL}, #{gzsj,jdbcType=DECIMAL}, 
+      #{whsj,jdbcType=DECIMAL}, #{yxsj,jdbcType=DECIMAL}, #{tjsj,jdbcType=DECIMAL}, #{pjqrfs,jdbcType=DECIMAL}, 
+      #{xnssdl,jdbcType=DECIMAL}, #{nhyd,jdbcType=DECIMAL}, #{glyzxxs,jdbcType=DECIMAL}, 
+      #{lyxs,jdbcType=DECIMAL}, #{sbklyl,jdbcType=DECIMAL}, #{dxklyxs,jdbcType=DECIMAL}, 
+      #{yxfss,jdbcType=DECIMAL}, #{pjfs,jdbcType=DECIMAL}, #{jfpl,jdbcType=DECIMAL}, 
+      #{tid,jdbcType=DECIMAL}, #{wl1txnqk,jdbcType=VARCHAR}, #{wl3txnqk,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTMAIN3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="recodedate != null">
+        RECODEDATE,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wtname != null">
+        WTNAME,
+      </if>
+      <if test="pjdj != null">
+        PJDJ,
+      </if>
+      <if test="pjjg != null">
+        PJJG,
+      </if>
+      <if test="yfdl != null">
+        YFDL,
+      </if>
+      <if test="bwsj != null">
+        BWSJ,
+      </if>
+      <if test="nfdl != null">
+        NFDL,
+      </if>
+      <if test="yfdlhb != null">
+        YFDLHB,
+      </if>
+      <if test="yfdltb != null">
+        YFDLTB,
+      </if>
+      <if test="ygzcs != null">
+        YGZCS,
+      </if>
+      <if test="ygzsc != null">
+        YGZSC,
+      </if>
+      <if test="bgscry != null">
+        BGSCRY,
+      </if>
+      <if test="bgsj != null">
+        BGSJ,
+      </if>
+      <if test="fdlgzcs != null">
+        FDLGZCS,
+      </if>
+      <if test="fdlbjcs != null">
+        FDLBJCS,
+      </if>
+      <if test="fdljkqk != null">
+        FDLJKQK,
+      </if>
+      <if test="clxgzcs != null">
+        CLXGZCS,
+      </if>
+      <if test="clxbjcs != null">
+        CLXBJCS,
+      </if>
+      <if test="clxjkqk != null">
+        CLXJKQK,
+      </if>
+      <if test="bjgzcs != null">
+        BJGZCS,
+      </if>
+      <if test="bjbjcs != null">
+        BJBJCS,
+      </if>
+      <if test="bjjkqk != null">
+        BJJKQK,
+      </if>
+      <if test="zkgzcs != null">
+        ZKGZCS,
+      </if>
+      <if test="zkbjcs != null">
+        ZKBJCS,
+      </if>
+      <if test="zkjkqk != null">
+        ZKJKQK,
+      </if>
+      <if test="llfdl != null">
+        LLFDL,
+      </if>
+      <if test="pjgl != null">
+        PJGL,
+      </if>
+      <if test="gzssdl != null">
+        GZSSDL,
+      </if>
+      <if test="xdssdll != null">
+        XDSSDLL,
+      </if>
+      <if test="whssdl != null">
+        WHSSDL,
+      </if>
+      <if test="gzsj != null">
+        GZSJ,
+      </if>
+      <if test="whsj != null">
+        WHSJ,
+      </if>
+      <if test="yxsj != null">
+        YXSJ,
+      </if>
+      <if test="tjsj != null">
+        TJSJ,
+      </if>
+      <if test="pjqrfs != null">
+        PJQRFS,
+      </if>
+      <if test="xnssdl != null">
+        XNSSDL,
+      </if>
+      <if test="nhyd != null">
+        NHYD,
+      </if>
+      <if test="glyzxxs != null">
+        GLYZXXS,
+      </if>
+      <if test="lyxs != null">
+        LYXS,
+      </if>
+      <if test="sbklyl != null">
+        SBKLYL,
+      </if>
+      <if test="dxklyxs != null">
+        DXKLYXS,
+      </if>
+      <if test="yxfss != null">
+        YXFSS,
+      </if>
+      <if test="pjfs != null">
+        PJFS,
+      </if>
+      <if test="jfpl != null">
+        JFPL,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="wl1txnqk != null">
+        WL1TXNQK,
+      </if>
+      <if test="wl3txnqk != null">
+        WL3TXNQK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="recodedate != null">
+        #{recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        #{wtname,jdbcType=VARCHAR},
+      </if>
+      <if test="pjdj != null">
+        #{pjdj,jdbcType=VARCHAR},
+      </if>
+      <if test="pjjg != null">
+        #{pjjg,jdbcType=VARCHAR},
+      </if>
+      <if test="yfdl != null">
+        #{yfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="bwsj != null">
+        #{bwsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="nfdl != null">
+        #{nfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="yfdlhb != null">
+        #{yfdlhb,jdbcType=DECIMAL},
+      </if>
+      <if test="yfdltb != null">
+        #{yfdltb,jdbcType=DECIMAL},
+      </if>
+      <if test="ygzcs != null">
+        #{ygzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="ygzsc != null">
+        #{ygzsc,jdbcType=DECIMAL},
+      </if>
+      <if test="bgscry != null">
+        #{bgscry,jdbcType=VARCHAR},
+      </if>
+      <if test="bgsj != null">
+        #{bgsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fdlgzcs != null">
+        #{fdlgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="fdlbjcs != null">
+        #{fdlbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="fdljkqk != null">
+        #{fdljkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="clxgzcs != null">
+        #{clxgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="clxbjcs != null">
+        #{clxbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="clxjkqk != null">
+        #{clxjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="bjgzcs != null">
+        #{bjgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="bjbjcs != null">
+        #{bjbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="bjjkqk != null">
+        #{bjjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="zkgzcs != null">
+        #{zkgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="zkbjcs != null">
+        #{zkbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="zkjkqk != null">
+        #{zkjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="llfdl != null">
+        #{llfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="pjgl != null">
+        #{pjgl,jdbcType=DECIMAL},
+      </if>
+      <if test="gzssdl != null">
+        #{gzssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="xdssdll != null">
+        #{xdssdll,jdbcType=DECIMAL},
+      </if>
+      <if test="whssdl != null">
+        #{whssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="gzsj != null">
+        #{gzsj,jdbcType=DECIMAL},
+      </if>
+      <if test="whsj != null">
+        #{whsj,jdbcType=DECIMAL},
+      </if>
+      <if test="yxsj != null">
+        #{yxsj,jdbcType=DECIMAL},
+      </if>
+      <if test="tjsj != null">
+        #{tjsj,jdbcType=DECIMAL},
+      </if>
+      <if test="pjqrfs != null">
+        #{pjqrfs,jdbcType=DECIMAL},
+      </if>
+      <if test="xnssdl != null">
+        #{xnssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="nhyd != null">
+        #{nhyd,jdbcType=DECIMAL},
+      </if>
+      <if test="glyzxxs != null">
+        #{glyzxxs,jdbcType=DECIMAL},
+      </if>
+      <if test="lyxs != null">
+        #{lyxs,jdbcType=DECIMAL},
+      </if>
+      <if test="sbklyl != null">
+        #{sbklyl,jdbcType=DECIMAL},
+      </if>
+      <if test="dxklyxs != null">
+        #{dxklyxs,jdbcType=DECIMAL},
+      </if>
+      <if test="yxfss != null">
+        #{yxfss,jdbcType=DECIMAL},
+      </if>
+      <if test="pjfs != null">
+        #{pjfs,jdbcType=DECIMAL},
+      </if>
+      <if test="jfpl != null">
+        #{jfpl,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="wl1txnqk != null">
+        #{wl1txnqk,jdbcType=VARCHAR},
+      </if>
+      <if test="wl3txnqk != null">
+        #{wl3txnqk,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORTMAIN3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTMAIN3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.recodedate != null">
+        RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtname != null">
+        WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pjdj != null">
+        PJDJ = #{record.pjdj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pjjg != null">
+        PJJG = #{record.pjjg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yfdl != null">
+        YFDL = #{record.yfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.bwsj != null">
+        BWSJ = #{record.bwsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.nfdl != null">
+        NFDL = #{record.nfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yfdlhb != null">
+        YFDLHB = #{record.yfdlhb,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yfdltb != null">
+        YFDLTB = #{record.yfdltb,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ygzcs != null">
+        YGZCS = #{record.ygzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ygzsc != null">
+        YGZSC = #{record.ygzsc,jdbcType=DECIMAL},
+      </if>
+      <if test="record.bgscry != null">
+        BGSCRY = #{record.bgscry,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bgsj != null">
+        BGSJ = #{record.bgsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.fdlgzcs != null">
+        FDLGZCS = #{record.fdlgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.fdlbjcs != null">
+        FDLBJCS = #{record.fdlbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.fdljkqk != null">
+        FDLJKQK = #{record.fdljkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clxgzcs != null">
+        CLXGZCS = #{record.clxgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.clxbjcs != null">
+        CLXBJCS = #{record.clxbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.clxjkqk != null">
+        CLXJKQK = #{record.clxjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bjgzcs != null">
+        BJGZCS = #{record.bjgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.bjbjcs != null">
+        BJBJCS = #{record.bjbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.bjjkqk != null">
+        BJJKQK = #{record.bjjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zkgzcs != null">
+        ZKGZCS = #{record.zkgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zkbjcs != null">
+        ZKBJCS = #{record.zkbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zkjkqk != null">
+        ZKJKQK = #{record.zkjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.llfdl != null">
+        LLFDL = #{record.llfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pjgl != null">
+        PJGL = #{record.pjgl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.gzssdl != null">
+        GZSSDL = #{record.gzssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.xdssdll != null">
+        XDSSDLL = #{record.xdssdll,jdbcType=DECIMAL},
+      </if>
+      <if test="record.whssdl != null">
+        WHSSDL = #{record.whssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.gzsj != null">
+        GZSJ = #{record.gzsj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.whsj != null">
+        WHSJ = #{record.whsj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yxsj != null">
+        YXSJ = #{record.yxsj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tjsj != null">
+        TJSJ = #{record.tjsj,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pjqrfs != null">
+        PJQRFS = #{record.pjqrfs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.xnssdl != null">
+        XNSSDL = #{record.xnssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.nhyd != null">
+        NHYD = #{record.nhyd,jdbcType=DECIMAL},
+      </if>
+      <if test="record.glyzxxs != null">
+        GLYZXXS = #{record.glyzxxs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.lyxs != null">
+        LYXS = #{record.lyxs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.sbklyl != null">
+        SBKLYL = #{record.sbklyl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dxklyxs != null">
+        DXKLYXS = #{record.dxklyxs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yxfss != null">
+        YXFSS = #{record.yxfss,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pjfs != null">
+        PJFS = #{record.pjfs,jdbcType=DECIMAL},
+      </if>
+      <if test="record.jfpl != null">
+        JFPL = #{record.jfpl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.wl1txnqk != null">
+        WL1TXNQK = #{record.wl1txnqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wl3txnqk != null">
+        WL3TXNQK = #{record.wl3txnqk,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTMAIN3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      PJDJ = #{record.pjdj,jdbcType=VARCHAR},
+      PJJG = #{record.pjjg,jdbcType=VARCHAR},
+      YFDL = #{record.yfdl,jdbcType=DECIMAL},
+      BWSJ = #{record.bwsj,jdbcType=TIMESTAMP},
+      NFDL = #{record.nfdl,jdbcType=DECIMAL},
+      YFDLHB = #{record.yfdlhb,jdbcType=DECIMAL},
+      YFDLTB = #{record.yfdltb,jdbcType=DECIMAL},
+      YGZCS = #{record.ygzcs,jdbcType=DECIMAL},
+      YGZSC = #{record.ygzsc,jdbcType=DECIMAL},
+      BGSCRY = #{record.bgscry,jdbcType=VARCHAR},
+      BGSJ = #{record.bgsj,jdbcType=TIMESTAMP},
+      FDLGZCS = #{record.fdlgzcs,jdbcType=DECIMAL},
+      FDLBJCS = #{record.fdlbjcs,jdbcType=DECIMAL},
+      FDLJKQK = #{record.fdljkqk,jdbcType=VARCHAR},
+      CLXGZCS = #{record.clxgzcs,jdbcType=DECIMAL},
+      CLXBJCS = #{record.clxbjcs,jdbcType=DECIMAL},
+      CLXJKQK = #{record.clxjkqk,jdbcType=VARCHAR},
+      BJGZCS = #{record.bjgzcs,jdbcType=DECIMAL},
+      BJBJCS = #{record.bjbjcs,jdbcType=DECIMAL},
+      BJJKQK = #{record.bjjkqk,jdbcType=VARCHAR},
+      ZKGZCS = #{record.zkgzcs,jdbcType=DECIMAL},
+      ZKBJCS = #{record.zkbjcs,jdbcType=DECIMAL},
+      ZKJKQK = #{record.zkjkqk,jdbcType=VARCHAR},
+      LLFDL = #{record.llfdl,jdbcType=DECIMAL},
+      PJGL = #{record.pjgl,jdbcType=DECIMAL},
+      GZSSDL = #{record.gzssdl,jdbcType=DECIMAL},
+      XDSSDLL = #{record.xdssdll,jdbcType=DECIMAL},
+      WHSSDL = #{record.whssdl,jdbcType=DECIMAL},
+      GZSJ = #{record.gzsj,jdbcType=DECIMAL},
+      WHSJ = #{record.whsj,jdbcType=DECIMAL},
+      YXSJ = #{record.yxsj,jdbcType=DECIMAL},
+      TJSJ = #{record.tjsj,jdbcType=DECIMAL},
+      PJQRFS = #{record.pjqrfs,jdbcType=DECIMAL},
+      XNSSDL = #{record.xnssdl,jdbcType=DECIMAL},
+      NHYD = #{record.nhyd,jdbcType=DECIMAL},
+      GLYZXXS = #{record.glyzxxs,jdbcType=DECIMAL},
+      LYXS = #{record.lyxs,jdbcType=DECIMAL},
+      SBKLYL = #{record.sbklyl,jdbcType=DECIMAL},
+      DXKLYXS = #{record.dxklyxs,jdbcType=DECIMAL},
+      YXFSS = #{record.yxfss,jdbcType=DECIMAL},
+      PJFS = #{record.pjfs,jdbcType=DECIMAL},
+      JFPL = #{record.jfpl,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      WL1TXNQK = #{record.wl1txnqk,jdbcType=VARCHAR},
+      WL3TXNQK = #{record.wl3txnqk,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTMAIN3
+    <set>
+      <if test="recodedate != null">
+        RECODEDATE = #{recodedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        WTNAME = #{wtname,jdbcType=VARCHAR},
+      </if>
+      <if test="pjdj != null">
+        PJDJ = #{pjdj,jdbcType=VARCHAR},
+      </if>
+      <if test="pjjg != null">
+        PJJG = #{pjjg,jdbcType=VARCHAR},
+      </if>
+      <if test="yfdl != null">
+        YFDL = #{yfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="bwsj != null">
+        BWSJ = #{bwsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="nfdl != null">
+        NFDL = #{nfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="yfdlhb != null">
+        YFDLHB = #{yfdlhb,jdbcType=DECIMAL},
+      </if>
+      <if test="yfdltb != null">
+        YFDLTB = #{yfdltb,jdbcType=DECIMAL},
+      </if>
+      <if test="ygzcs != null">
+        YGZCS = #{ygzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="ygzsc != null">
+        YGZSC = #{ygzsc,jdbcType=DECIMAL},
+      </if>
+      <if test="bgscry != null">
+        BGSCRY = #{bgscry,jdbcType=VARCHAR},
+      </if>
+      <if test="bgsj != null">
+        BGSJ = #{bgsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fdlgzcs != null">
+        FDLGZCS = #{fdlgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="fdlbjcs != null">
+        FDLBJCS = #{fdlbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="fdljkqk != null">
+        FDLJKQK = #{fdljkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="clxgzcs != null">
+        CLXGZCS = #{clxgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="clxbjcs != null">
+        CLXBJCS = #{clxbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="clxjkqk != null">
+        CLXJKQK = #{clxjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="bjgzcs != null">
+        BJGZCS = #{bjgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="bjbjcs != null">
+        BJBJCS = #{bjbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="bjjkqk != null">
+        BJJKQK = #{bjjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="zkgzcs != null">
+        ZKGZCS = #{zkgzcs,jdbcType=DECIMAL},
+      </if>
+      <if test="zkbjcs != null">
+        ZKBJCS = #{zkbjcs,jdbcType=DECIMAL},
+      </if>
+      <if test="zkjkqk != null">
+        ZKJKQK = #{zkjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="llfdl != null">
+        LLFDL = #{llfdl,jdbcType=DECIMAL},
+      </if>
+      <if test="pjgl != null">
+        PJGL = #{pjgl,jdbcType=DECIMAL},
+      </if>
+      <if test="gzssdl != null">
+        GZSSDL = #{gzssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="xdssdll != null">
+        XDSSDLL = #{xdssdll,jdbcType=DECIMAL},
+      </if>
+      <if test="whssdl != null">
+        WHSSDL = #{whssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="gzsj != null">
+        GZSJ = #{gzsj,jdbcType=DECIMAL},
+      </if>
+      <if test="whsj != null">
+        WHSJ = #{whsj,jdbcType=DECIMAL},
+      </if>
+      <if test="yxsj != null">
+        YXSJ = #{yxsj,jdbcType=DECIMAL},
+      </if>
+      <if test="tjsj != null">
+        TJSJ = #{tjsj,jdbcType=DECIMAL},
+      </if>
+      <if test="pjqrfs != null">
+        PJQRFS = #{pjqrfs,jdbcType=DECIMAL},
+      </if>
+      <if test="xnssdl != null">
+        XNSSDL = #{xnssdl,jdbcType=DECIMAL},
+      </if>
+      <if test="nhyd != null">
+        NHYD = #{nhyd,jdbcType=DECIMAL},
+      </if>
+      <if test="glyzxxs != null">
+        GLYZXXS = #{glyzxxs,jdbcType=DECIMAL},
+      </if>
+      <if test="lyxs != null">
+        LYXS = #{lyxs,jdbcType=DECIMAL},
+      </if>
+      <if test="sbklyl != null">
+        SBKLYL = #{sbklyl,jdbcType=DECIMAL},
+      </if>
+      <if test="dxklyxs != null">
+        DXKLYXS = #{dxklyxs,jdbcType=DECIMAL},
+      </if>
+      <if test="yxfss != null">
+        YXFSS = #{yxfss,jdbcType=DECIMAL},
+      </if>
+      <if test="pjfs != null">
+        PJFS = #{pjfs,jdbcType=DECIMAL},
+      </if>
+      <if test="jfpl != null">
+        JFPL = #{jfpl,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="wl1txnqk != null">
+        WL1TXNQK = #{wl1txnqk,jdbcType=VARCHAR},
+      </if>
+      <if test="wl3txnqk != null">
+        WL3TXNQK = #{wl3txnqk,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreportmain3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTMAIN3
+    set RECODEDATE = #{recodedate,jdbcType=TIMESTAMP},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      WTNAME = #{wtname,jdbcType=VARCHAR},
+      PJDJ = #{pjdj,jdbcType=VARCHAR},
+      PJJG = #{pjjg,jdbcType=VARCHAR},
+      YFDL = #{yfdl,jdbcType=DECIMAL},
+      BWSJ = #{bwsj,jdbcType=TIMESTAMP},
+      NFDL = #{nfdl,jdbcType=DECIMAL},
+      YFDLHB = #{yfdlhb,jdbcType=DECIMAL},
+      YFDLTB = #{yfdltb,jdbcType=DECIMAL},
+      YGZCS = #{ygzcs,jdbcType=DECIMAL},
+      YGZSC = #{ygzsc,jdbcType=DECIMAL},
+      BGSCRY = #{bgscry,jdbcType=VARCHAR},
+      BGSJ = #{bgsj,jdbcType=TIMESTAMP},
+      FDLGZCS = #{fdlgzcs,jdbcType=DECIMAL},
+      FDLBJCS = #{fdlbjcs,jdbcType=DECIMAL},
+      FDLJKQK = #{fdljkqk,jdbcType=VARCHAR},
+      CLXGZCS = #{clxgzcs,jdbcType=DECIMAL},
+      CLXBJCS = #{clxbjcs,jdbcType=DECIMAL},
+      CLXJKQK = #{clxjkqk,jdbcType=VARCHAR},
+      BJGZCS = #{bjgzcs,jdbcType=DECIMAL},
+      BJBJCS = #{bjbjcs,jdbcType=DECIMAL},
+      BJJKQK = #{bjjkqk,jdbcType=VARCHAR},
+      ZKGZCS = #{zkgzcs,jdbcType=DECIMAL},
+      ZKBJCS = #{zkbjcs,jdbcType=DECIMAL},
+      ZKJKQK = #{zkjkqk,jdbcType=VARCHAR},
+      LLFDL = #{llfdl,jdbcType=DECIMAL},
+      PJGL = #{pjgl,jdbcType=DECIMAL},
+      GZSSDL = #{gzssdl,jdbcType=DECIMAL},
+      XDSSDLL = #{xdssdll,jdbcType=DECIMAL},
+      WHSSDL = #{whssdl,jdbcType=DECIMAL},
+      GZSJ = #{gzsj,jdbcType=DECIMAL},
+      WHSJ = #{whsj,jdbcType=DECIMAL},
+      YXSJ = #{yxsj,jdbcType=DECIMAL},
+      TJSJ = #{tjsj,jdbcType=DECIMAL},
+      PJQRFS = #{pjqrfs,jdbcType=DECIMAL},
+      XNSSDL = #{xnssdl,jdbcType=DECIMAL},
+      NHYD = #{nhyd,jdbcType=DECIMAL},
+      GLYZXXS = #{glyzxxs,jdbcType=DECIMAL},
+      LYXS = #{lyxs,jdbcType=DECIMAL},
+      SBKLYL = #{sbklyl,jdbcType=DECIMAL},
+      DXKLYXS = #{dxklyxs,jdbcType=DECIMAL},
+      YXFSS = #{yxfss,jdbcType=DECIMAL},
+      PJFS = #{pjfs,jdbcType=DECIMAL},
+      JFPL = #{jfpl,jdbcType=DECIMAL},
+      TID = #{tid,jdbcType=DECIMAL},
+      WL1TXNQK = #{wl1txnqk,jdbcType=VARCHAR},
+      WL3TXNQK = #{wl3txnqk,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 350 - 0
src/main/resources/mybatis/auto/Wttragetreportpart3Mapper.xml

@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreportpart3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreportpart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="PARTNAME" jdbcType="VARCHAR" property="partname" />
+    <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="Q3YJKQK" jdbcType="VARCHAR" property="q3yjkqk" />
+    <result column="Q2YJKQK" jdbcType="VARCHAR" property="q2yjkqk" />
+    <result column="Q1YJKQK" jdbcType="VARCHAR" property="q1yjkqk" />
+    <result column="BNJKQK" jdbcType="VARCHAR" property="bnjkqk" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WTNAME" jdbcType="VARCHAR" property="wtname" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, TID, PARTNAME, RECORDDATE, Q3YJKQK, Q2YJKQK, Q1YJKQK, BNJKQK, WTID, WTNAME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTPART3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTPART3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTPART3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTPART3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTPART3 (ID, TID, PARTNAME, 
+      RECORDDATE, Q3YJKQK, Q2YJKQK, 
+      Q1YJKQK, BNJKQK, WTID, 
+      WTNAME)
+    values (#{id,jdbcType=DECIMAL}, #{tid,jdbcType=DECIMAL}, #{partname,jdbcType=VARCHAR}, 
+      #{recorddate,jdbcType=TIMESTAMP}, #{q3yjkqk,jdbcType=VARCHAR}, #{q2yjkqk,jdbcType=VARCHAR}, 
+      #{q1yjkqk,jdbcType=VARCHAR}, #{bnjkqk,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, 
+      #{wtname,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTPART3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="partname != null">
+        PARTNAME,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="q3yjkqk != null">
+        Q3YJKQK,
+      </if>
+      <if test="q2yjkqk != null">
+        Q2YJKQK,
+      </if>
+      <if test="q1yjkqk != null">
+        Q1YJKQK,
+      </if>
+      <if test="bnjkqk != null">
+        BNJKQK,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wtname != null">
+        WTNAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="partname != null">
+        #{partname,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3yjkqk != null">
+        #{q3yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="q2yjkqk != null">
+        #{q2yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="q1yjkqk != null">
+        #{q1yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="bnjkqk != null">
+        #{bnjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        #{wtname,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORTPART3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTPART3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.partname != null">
+        PARTNAME = #{record.partname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.q3yjkqk != null">
+        Q3YJKQK = #{record.q3yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.q2yjkqk != null">
+        Q2YJKQK = #{record.q2yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.q1yjkqk != null">
+        Q1YJKQK = #{record.q1yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bnjkqk != null">
+        BNJKQK = #{record.bnjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtname != null">
+        WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTPART3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      PARTNAME = #{record.partname,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      Q3YJKQK = #{record.q3yjkqk,jdbcType=VARCHAR},
+      Q2YJKQK = #{record.q2yjkqk,jdbcType=VARCHAR},
+      Q1YJKQK = #{record.q1yjkqk,jdbcType=VARCHAR},
+      BNJKQK = #{record.bnjkqk,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WTNAME = #{record.wtname,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTPART3
+    <set>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="partname != null">
+        PARTNAME = #{partname,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3yjkqk != null">
+        Q3YJKQK = #{q3yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="q2yjkqk != null">
+        Q2YJKQK = #{q2yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="q1yjkqk != null">
+        Q1YJKQK = #{q1yjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="bnjkqk != null">
+        BNJKQK = #{bnjkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        WTNAME = #{wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreportpart3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTPART3
+    set TID = #{tid,jdbcType=DECIMAL},
+      PARTNAME = #{partname,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      Q3YJKQK = #{q3yjkqk,jdbcType=VARCHAR},
+      Q2YJKQK = #{q2yjkqk,jdbcType=VARCHAR},
+      Q1YJKQK = #{q1yjkqk,jdbcType=VARCHAR},
+      BNJKQK = #{bnjkqk,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      WTNAME = #{wtname,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 335 - 0
src/main/resources/mybatis/auto/Wttragetreportxndjpj3Mapper.xml

@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.Wttragetreportxndjpj3Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Wttragetreportxndjpj3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="TID" jdbcType="DECIMAL" property="tid" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="Q3YSJ" jdbcType="VARCHAR" property="q3ysj" />
+    <result column="Q2YSJ" jdbcType="VARCHAR" property="q2ysj" />
+    <result column="Q1YSJ" jdbcType="VARCHAR" property="q1ysj" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WTNAME" jdbcType="VARCHAR" property="wtname" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, TID, NAME, RECORDDATE, Q3YSJ, Q2YSJ, Q1YSJ, WTID, WTNAME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTXNDJPJ3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WTTRAGETREPORTXNDJPJ3
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTXNDJPJ3
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WTTRAGETREPORTXNDJPJ3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTXNDJPJ3 (ID, TID, NAME, 
+      RECORDDATE, Q3YSJ, Q2YSJ, 
+      Q1YSJ, WTID, WTNAME
+      )
+    values (#{id,jdbcType=DECIMAL}, #{tid,jdbcType=DECIMAL}, #{name,jdbcType=VARCHAR}, 
+      #{recorddate,jdbcType=TIMESTAMP}, #{q3ysj,jdbcType=VARCHAR}, #{q2ysj,jdbcType=VARCHAR}, 
+      #{q1ysj,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, #{wtname,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WTTRAGETREPORTXNDJPJ3
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="q3ysj != null">
+        Q3YSJ,
+      </if>
+      <if test="q2ysj != null">
+        Q2YSJ,
+      </if>
+      <if test="q1ysj != null">
+        Q1YSJ,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wtname != null">
+        WTNAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3ysj != null">
+        #{q3ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="q2ysj != null">
+        #{q2ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="q1ysj != null">
+        #{q1ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        #{wtname,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WTTRAGETREPORTXNDJPJ3
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTXNDJPJ3
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.q3ysj != null">
+        Q3YSJ = #{record.q3ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.q2ysj != null">
+        Q2YSJ = #{record.q2ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.q1ysj != null">
+        Q1YSJ = #{record.q1ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtname != null">
+        WTNAME = #{record.wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTXNDJPJ3
+    set ID = #{record.id,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=DECIMAL},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      Q3YSJ = #{record.q3ysj,jdbcType=VARCHAR},
+      Q2YSJ = #{record.q2ysj,jdbcType=VARCHAR},
+      Q1YSJ = #{record.q1ysj,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WTNAME = #{record.wtname,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTXNDJPJ3
+    <set>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="q3ysj != null">
+        Q3YSJ = #{q3ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="q2ysj != null">
+        Q2YSJ = #{q2ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="q1ysj != null">
+        Q1YSJ = #{q1ysj,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtname != null">
+        WTNAME = #{wtname,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Wttragetreportxndjpj3">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WTTRAGETREPORTXNDJPJ3
+    set TID = #{tid,jdbcType=DECIMAL},
+      NAME = #{name,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      Q3YSJ = #{q3ysj,jdbcType=VARCHAR},
+      Q2YSJ = #{q2ysj,jdbcType=VARCHAR},
+      Q1YSJ = #{q1ysj,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      WTNAME = #{wtname,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 1 - 1
src/test/java/test/MatrixByWpPushTest.java

@@ -28,7 +28,7 @@ public class MatrixByWpPushTest {
 
 
 
-        Map<String, Object> map = matrixPushByWpService.genreSetMap();
+        Map<String, Object> map = matrixPushByWpService.findMatrixById("MG01_01");
 
 
 

+ 79 - 0
src/test/java/test/ShutdowneventServiceTest.java

@@ -0,0 +1,79 @@
+package test;
+
+import com.gyee.SpringbootStart;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.service.ShutdowneventService;
+import lombok.SneakyThrows;
+import org.springframework.boot.SpringApplication;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ShutdowneventServiceTest {
+
+    @SneakyThrows
+    public static void main(String[] args) {
+
+        SpringApplication.run(SpringbootStart.class, args);
+
+
+
+        String wtId="MG01_03";
+        String wpId="MHS_FDC";
+        String year="2021";
+        String month="1";
+
+        ShutdowneventService shutdowneventService= SpringUtils.getBean("shutdowneventService");
+
+
+
+
+        List<String> wtids=new ArrayList<>();
+
+        for(Windturbine wt: InitialRunner.wtls)
+        {
+            wtids.add(wt.getId());
+        }
+        Map<String,Object> map = shutdowneventService.queryMttrAndMtbf(wtids);
+
+
+        System.out.println(map.size());
+
+//        AjaxResult ar = singleAnalysisController.singleanalysisSub(wtId,year,month);
+//
+//        Map<String,Object> map=( Map<String,Object>)ar.get("data");
+//        for(SingleAnalysisVo wtd:vos)
+//        {
+//            System.out.println(wtd.getXfqr()+"----------------"+wtd.getXfqrhgl());
+//        }
+//
+//        AjaxResult ar = singleAnalysisController.singleanalysisChart(wtId,year,month);
+//
+//        Map<String, List<SingleAnalysisVo>> map=( Map<String,List<SingleAnalysisVo>>)ar.get("data");
+//        List<SingleAnalysisVo> vos=map.get("ff");
+//        for(SingleAnalysisVo wtd:vos)
+//        {
+//            System.out.println(wtd.getFdl()+"----------------"+wtd.getFs());
+//        }
+//
+//        System.out.println("---------------------------------------------------------------------------------");
+//        vos=map.get("ws");
+//        for(SingleAnalysisVo wtd:vos)
+//        {
+//            System.out.println(wtd.getGzss()+"----------------"+wtd.getJxss()+"----------------"+wtd.getXdss()
+//                    +"----------------"+wtd.getXnss()+"----------------"+wtd.getSlss());
+//        }
+//        System.out.println("---------------------------------------------------------------------------------");
+//        vos=map.get("jd");
+//        for(SingleAnalysisVo wtd:vos)
+//        {
+//            System.out.println(wtd.getJfpl()+"----------------"+wtd.getTjxs());
+//        }
+//
+//
+//
+    }
+}

+ 10 - 3
src/test/java/test/WpInfoPushTest.java

@@ -2,11 +2,13 @@ package test;
 
 import com.gyee.SpringbootStart;
 import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.service.websocket.WpInfoPushService;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
-import java.util.Map;
+import java.util.Date;
+import java.util.List;
 
 public class WpInfoPushTest {
 
@@ -28,11 +30,16 @@ public class WpInfoPushTest {
 
 
 
-        Map<String, Object> map = wpInfoPushService.genreSetMap();
+    //    Map<String, Object> map = wpInfoPushService.genreSetMap();
 
+        Date begin=new Date();
+ //       Map<String, Object> map = wpInfoPushService.genreSetMap("SBQ_FDC");
 
+        List<DataVo> vos=wpInfoPushService.findLossWpBar("SBQ_FDC");
 
-         System.out.println(map.size());
+        Date end=new Date();
+        System.out.println((end.getTime()-begin.getTime())/1000);
+         System.out.println(vos.size());
 
 
 

+ 16 - 10
src/test/java/test/WtHealthReportTest.java

@@ -1,16 +1,16 @@
 package test;
 
 import com.gyee.SpringbootStart;
-import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.report.WtHealthReportController;
-import com.gyee.frame.model.auto.WtTragetReportChart;
+import com.gyee.frame.service.report.WtHealthReport3Service;
+import com.gyee.frame.util.DateUtils;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
+import java.util.Map;
 
 public class WtHealthReportTest {
 
@@ -36,7 +36,7 @@ public class WtHealthReportTest {
 
         WtHealthReportController wtHealthReportController= SpringUtils.getBean("wtHealthReportController");
 
-
+        WtHealthReport3Service wtHealthReport3Service= SpringUtils.getBean("wtHealthReport3Service");
 //        AjaxResult ajaxResult =wtHealthReportController.healthReport(wtid,"2021-03-24");
 //
 //        Map<String,Object> test=(Map<String,Object>)ajaxResult.get("data");
@@ -50,15 +50,21 @@ public class WtHealthReportTest {
 //        }
 //        System.out.println("***************************************************************************************");
 
-        AjaxResult ajaxResult =wtHealthReportController.healthReportChart(wtid,"fdj","2021-03-24");
+//        AjaxResult ajaxResult =wtHealthReportController.healthReportChart(wtid,"fdj","2021-03-24");
+//
+//        List<WtTragetReportChart> test2=(List<WtTragetReportChart>)ajaxResult.get("data");
+//
+//
+//        for(WtTragetReportChart wtd:test2)
+//        {
+//            System.out.println(wtd.getRecorddate()+"----------------"+wtd.getValue()+"----------------"+wtd.getWtname());
+//        }
+
 
-        List<WtTragetReportChart> test2=(List<WtTragetReportChart>)ajaxResult.get("data");
+        Map<String, Object> map =wtHealthReport3Service.healthReport(wtid, DateUtils.parseStrtoDate("2021-06-19"));
 
+        System.out.println(map.size());
 
-        for(WtTragetReportChart wtd:test2)
-        {
-            System.out.println(wtd.getRecorddate()+"----------------"+wtd.getValue()+"----------------"+wtd.getWtname());
-        }
 //        System.out.println("***************************************************************************************");
 //
 //        AjaxResult ajaxResult =compareController.compareDayChat(wtid,date);

+ 2 - 1
src/test/java/test/WtInfoPushServiceTest.java

@@ -7,6 +7,7 @@ import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 public class WtInfoPushServiceTest {
@@ -31,7 +32,7 @@ public class WtInfoPushServiceTest {
 
         Date begin=new Date();
 
-        Map<String, Object> map = wtInfoPushService.genreSetMap();
+        List<Map<String, Object>> map = wtInfoPushService.genreSetMap("SBQ_FDC");
 
 
         Date end=new Date();

+ 4 - 2
src/test/java/test/WtWarnPushServiceTest.java

@@ -6,6 +6,7 @@ import com.gyee.frame.service.websocket.WtWarnPushService;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
+import java.util.Date;
 import java.util.Map;
 
 public class WtWarnPushServiceTest {
@@ -27,11 +28,12 @@ public class WtWarnPushServiceTest {
 
 
 
-
+        Date begin=new Date();
         Map<String, Object> map = wtWarnPushService.genreSetMap();
 
 
-
+        Date end=new Date();
+        System.out.println((end.getTime()-begin.getTime())/1000);
          System.out.println(map.size());