移植智能检修首页接口

web/health-hb/src/main/java/com/gyee/frame/controller/health/ReliabilityAnalysisController.java

@@ -5,19 +5,25 @@ import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.feign.RemoteServiceBuilder;
 import com.gyee.frame.mapper.auto.WindturbineMapper;
-import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.auto.MetricsCode;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.model.auto.Windturbinetestingpointnew;
 import com.gyee.frame.model.custom.export.TsPointData;
 import com.gyee.frame.service.Alertrule2ervice;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindTurbineTestingPointDiService;
 import com.gyee.frame.service.health.MetricsService;
 import com.gyee.frame.service.health.MetricsUniformCodeService;
+import com.gyee.frame.util.StringUtils;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @CrossOrigin
@@ -57,28 +63,31 @@ public class ReliabilityAnalysisController {
             @RequestParam(name = "name") String name,
             @RequestParam(name = "startTs") long startTs,
             @RequestParam(name = "endTs") long endTs,
-            @RequestParam(name = "interval", required = false) Optional<Integer> interval){
+            @RequestParam(name = "interval", required = false) Integer interval){
 
         List<Object> list = new ArrayList<>();
         Windturbine wtmid = windturbineMapper.selectByPrimaryKey(wtId);
 
-        List<String> codes = alertrule2ervice.getUniformCodeByNameAndStation(name, station, wtmid.getModelid());
-        if (codes == null || codes.size() == 0)
-            return AjaxResult.successData(AjaxStatus.success.code, list);
-
-        for (String code : codes){
-            Map<String, Object> map = new HashMap<>();
-            if (code.startsWith("AI")){
-                Windturbinetestingpointnew windAI = windAIService.getWindTurbineTestingPointAi2(wtId, code);
-                List<TsPointData> data = null;
-                if (interval.isPresent() && interval.get() > 0)
-                    data = remoteService.ShardingService().getHistorySnap(windAI.getCode(), startTs, endTs, interval.get());
-                else
-                    data = remoteService.ShardingService().getHistoryRaw(windAI.getCode(), startTs, endTs);
-
-                // 查询点的单位和描述属性
-                String unit = "--";
-                String desc = "----";
+        if(StringUtils.notEmp(wtmid))
+        {
+
+            List<String> codes = alertrule2ervice.getUniformCodeByNameAndStation(name, station, wtmid.getModelid());
+            if (codes == null || codes.size() == 0)
+                return AjaxResult.successData(AjaxStatus.success.code, list);
+
+            for (String code : codes){
+                Map<String, Object> map = new HashMap<>();
+                if (code.startsWith("AI")){
+                    Windturbinetestingpointnew windAI = windAIService.getWindTurbineTestingPointAi2(wtId, code);
+                    List<TsPointData> data = null;
+                    if (null !=interval)
+                        data = remoteService.ShardingService().getHistorySnap(windAI.getCode(), startTs, endTs, interval);
+                    else
+                        data = remoteService.ShardingService().getHistoryRaw(windAI.getCode(), startTs, endTs);
+
+                    // 查询点的单位和描述属性
+                    String unit = "--";
+                    String desc = "----";
                 /*List<MetricsUniformCode> metricsList = uniformCodeService.getListByStationAndUniforCode(station, windAI.getUniformcode());
                 if (metricsList != null && metricsList.size() > 0) {
                     MetricsUniformCode metricsUniformCode = metricsList.get(0);
@@ -88,16 +97,18 @@ public class ReliabilityAnalysisController {
                         desc = metrics.get(1).getMetricname();
                     }
                 }*/
-                MetricsCode metrics=uniformCodeService.getListName(wtId,windAI.getUniformcode());
-                String nm = metrics==null?"":metrics.getName();
-                map.put("unit", unit);
-                map.put("name", nm);
-                map.put("data", data);
-
-                list.add(map);
+                    MetricsCode metrics=uniformCodeService.getListName(wtId,windAI.getUniformcode());
+                    String nm = metrics==null?"":metrics.getName();
+                    map.put("unit", unit);
+                    map.put("name", nm);
+                    map.put("data", data);
+
+                    list.add(map);
+                }
             }
         }
 
+
         return AjaxResult.successData(AjaxStatus.success.code, list);
     }
 

web/health-hb/src/main/java/com/gyee/frame/controller/reliability/EquoperationrecordController.java

@@ -8,11 +8,11 @@ import com.gyee.frame.model.auto.Companies;
 import com.gyee.frame.model.auto.Equoperationrecord;
 import com.gyee.frame.model.auto.Warehouse;
 import com.gyee.frame.model.auto.WindturbineSql;
+import com.gyee.frame.model.custom.EquoperationrecordVo;
+import com.gyee.frame.model.custom.InventoryVo;
+import com.gyee.frame.model.custom.PolineVo;
 import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.service.CompaniesSqlService;
-import com.gyee.frame.service.EquoperationrecordService;
-import com.gyee.frame.service.WarehouseSqlService;
-import com.gyee.frame.service.WindturbineSqlService;
+import com.gyee.frame.service.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -36,6 +36,9 @@ public class EquoperationrecordController {
 
     @Resource
     private WarehouseSqlService warehouseSqlService;
+
+    @Resource
+    private PolineSqlService polineSqlService;
     /**
      * 预警评判分析
 
@@ -106,4 +109,58 @@ public class EquoperationrecordController {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         }
     }
+
+
+    @PostMapping("/selectPolinePageList")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public AjaxResult equoperationrecord(
+            @RequestBody Tablepar tablepar,
+            @RequestParam(value = "vendor", required = false) String vendor,
+            @RequestParam(value = "warehouse", required = false) String warehouse,
+            @RequestParam(value = "ponum", required = false) String ponum,
+            @RequestParam(value = "starttime", required = false) String starttime,
+            @RequestParam(value = "endtime",required = false)String endtime)  {
+
+        PageInfo<PolineVo> vos=new PageInfo<>();
+
+        vos = polineSqlService.selectPolinePageList(tablepar, vendor, warehouse, ponum, starttime, endtime);
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+    }
+
+
+    @GetMapping("/equupdatecount")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public AjaxResult selectEquUpdateCount(
+            @RequestParam(value = "stId") String stId)  {
+
+        List<EquoperationrecordVo> vos = equoperationrecordService.selectEquUpdateCount(stId);
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+    }
+
+
+    @GetMapping(value = "/groupcount")
+    @ResponseBody
+    public AjaxResult getInventoryClassGroupCount( @RequestParam(value = "stId") String stId){
+
+            List<InventoryVo> vos = equoperationrecordService.getInventoryClassGroupCount(stId);
+
+            if (null!=vos) {
+                return AjaxResult.successData(AjaxStatus.success.code, vos);
+            } else {
+                return AjaxResult.successData(AjaxStatus.success.code, vos);
+            }
+    }
+
 }

web/health-hb/src/main/java/com/gyee/frame/mapper/auto/EquoperationrecordMapper.java

@@ -2,6 +2,8 @@ package com.gyee.frame.mapper.auto;
 
 import com.gyee.frame.model.auto.Equoperationrecord;
 import com.gyee.frame.model.auto.EquoperationrecordExample;
+import com.gyee.frame.model.custom.EquoperationrecordVo;
+import com.gyee.frame.model.custom.InventoryVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -101,4 +103,8 @@ public interface EquoperationrecordMapper {
                                                               @Param("wtid")String wtid,
                                                               @Param("type")String type);
 
+    List<EquoperationrecordVo> selectEquUpdateCount(@Param("stId") String stId);
+
+
+    List<InventoryVo> getInventoryClassGroupCount(@Param("stId") String stId);
 }

web/health-hb/src/main/java/com/gyee/frame/mapper/auto/InventoryMapper.java

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

web/health-hb/src/main/java/com/gyee/frame/mapper/auto/PolineMapper.java

@@ -0,0 +1,103 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Poline;
+import com.gyee.frame.model.auto.PolineExample;
+import com.gyee.frame.model.custom.PolineVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface PolineMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    long countByExample(PolineExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(PolineExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(BigDecimal id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int insert(Poline record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Poline record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    List<Poline> selectByExample(PolineExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    Poline selectByPrimaryKey(BigDecimal id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Poline record, @Param("example") PolineExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Poline record, @Param("example") PolineExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Poline record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table POLINE
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Poline record);
+
+    List<PolineVo> selectPolineList(@Param("vendor")String vendor, @Param("warehouse")String warehouse,
+                                    @Param("ponum")String ponum, @Param("starttime")String starttime, @Param("endtime")String endtime);
+
+}

web/health-hb/src/main/java/com/gyee/frame/model/auto/Earlywarningmain.java

@@ -11,7 +11,7 @@ public class Earlywarningmain implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer id;
+    private String id;
 
     /**
      *
@@ -398,7 +398,7 @@ public class Earlywarningmain implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
@@ -410,7 +410,7 @@ public class Earlywarningmain implements Serializable {
      *
      * @mbg.generated
      */
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/EarlywarningmainExample.java

@@ -205,52 +205,52 @@ public class EarlywarningmainExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Integer value) {
+        public Criteria andIdEqualTo(String value) {
             addCriterion("ID =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Integer value) {
+        public Criteria andIdNotEqualTo(String value) {
             addCriterion("ID <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Integer value) {
+        public Criteria andIdGreaterThan(String value) {
             addCriterion("ID >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
             addCriterion("ID >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Integer value) {
+        public Criteria andIdLessThan(String value) {
             addCriterion("ID <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
             addCriterion("ID <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Integer> values) {
+        public Criteria andIdIn(List<String> values) {
             addCriterion("ID in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Integer> values) {
+        public Criteria andIdNotIn(List<String> values) {
             addCriterion("ID not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Integer value1, Integer value2) {
+        public Criteria andIdBetween(String value1, String value2) {
             addCriterion("ID between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
             addCriterion("ID not between", value1, value2, "id");
             return (Criteria) this;
         }

web/health-hb/src/main/java/com/gyee/frame/model/auto/Failurestatisticsmain.java

@@ -11,7 +11,7 @@ public class Failurestatisticsmain implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer id;
+    private String id;
 
     /**
      *
@@ -398,7 +398,7 @@ public class Failurestatisticsmain implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
@@ -410,7 +410,7 @@ public class Failurestatisticsmain implements Serializable {
      *
      * @mbg.generated
      */
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

web/health-hb/src/main/java/com/gyee/frame/model/auto/FailurestatisticsmainExample.java

@@ -205,52 +205,52 @@ public class FailurestatisticsmainExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Integer value) {
+        public Criteria andIdEqualTo(String value) {
             addCriterion("ID =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Integer value) {
+        public Criteria andIdNotEqualTo(String value) {
             addCriterion("ID <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Integer value) {
+        public Criteria andIdGreaterThan(String value) {
             addCriterion("ID >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
             addCriterion("ID >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Integer value) {
+        public Criteria andIdLessThan(String value) {
             addCriterion("ID <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
             addCriterion("ID <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Integer> values) {
+        public Criteria andIdIn(List<String> values) {
             addCriterion("ID in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Integer> values) {
+        public Criteria andIdNotIn(List<String> values) {
             addCriterion("ID not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Integer value1, Integer value2) {
+        public Criteria andIdBetween(String value1, String value2) {
             addCriterion("ID between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
             addCriterion("ID not between", value1, value2, "id");
             return (Criteria) this;
         }

web/health-hb/src/main/java/com/gyee/frame/model/auto/Inventory.java

@@ -0,0 +1,807 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Inventory implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ID
+     *
+     * @mbg.generated
+     */
+    private BigDecimal id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ITEMNUM
+     *
+     * @mbg.generated
+     */
+    private String itemnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.WAREHOUSE
+     *
+     * @mbg.generated
+     */
+    private String warehouse;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.BINNUM
+     *
+     * @mbg.generated
+     */
+    private String binnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.VENDOR
+     *
+     * @mbg.generated
+     */
+    private String vendor;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.MANUFACTURER
+     *
+     * @mbg.generated
+     */
+    private String manufacturer;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.MODELNUM
+     *
+     * @mbg.generated
+     */
+    private String modelnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.MINLEVEL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal minlevel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.MAXLEVEL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal maxlevel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.STOCKTYPE
+     *
+     * @mbg.generated
+     */
+    private String stocktype;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ORDERUNIT
+     *
+     * @mbg.generated
+     */
+    private String orderunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ISSUEUNIT
+     *
+     * @mbg.generated
+     */
+    private String issueunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.CONVERSION
+     *
+     * @mbg.generated
+     */
+    private Long conversion;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ORDERQTY
+     *
+     * @mbg.generated
+     */
+    private BigDecimal orderqty;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.STDCOST
+     *
+     * @mbg.generated
+     */
+    private BigDecimal stdcost;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.AVGCOST
+     *
+     * @mbg.generated
+     */
+    private BigDecimal avgcost;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.LASTCOST
+     *
+     * @mbg.generated
+     */
+    private BigDecimal lastcost;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.LASTISSUEDATE
+     *
+     * @mbg.generated
+     */
+    private Date lastissuedate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ISSUEYTD
+     *
+     * @mbg.generated
+     */
+    private BigDecimal issueytd;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ABCTYPE
+     *
+     * @mbg.generated
+     */
+    private String abctype;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.SSTOCK
+     *
+     * @mbg.generated
+     */
+    private Long sstock;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.ITEMDESC
+     *
+     * @mbg.generated
+     */
+    private String itemdesc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.SITENUM
+     *
+     * @mbg.generated
+     */
+    private String sitenum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column INVENTORY.CORPNUM
+     *
+     * @mbg.generated
+     */
+    private String corpnum;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table INVENTORY
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ID
+     *
+     * @return the value of INVENTORY.ID
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ID
+     *
+     * @param id the value for INVENTORY.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ITEMNUM
+     *
+     * @return the value of INVENTORY.ITEMNUM
+     *
+     * @mbg.generated
+     */
+    public String getItemnum() {
+        return itemnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ITEMNUM
+     *
+     * @param itemnum the value for INVENTORY.ITEMNUM
+     *
+     * @mbg.generated
+     */
+    public void setItemnum(String itemnum) {
+        this.itemnum = itemnum == null ? null : itemnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.WAREHOUSE
+     *
+     * @return the value of INVENTORY.WAREHOUSE
+     *
+     * @mbg.generated
+     */
+    public String getWarehouse() {
+        return warehouse;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.WAREHOUSE
+     *
+     * @param warehouse the value for INVENTORY.WAREHOUSE
+     *
+     * @mbg.generated
+     */
+    public void setWarehouse(String warehouse) {
+        this.warehouse = warehouse == null ? null : warehouse.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.BINNUM
+     *
+     * @return the value of INVENTORY.BINNUM
+     *
+     * @mbg.generated
+     */
+    public String getBinnum() {
+        return binnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.BINNUM
+     *
+     * @param binnum the value for INVENTORY.BINNUM
+     *
+     * @mbg.generated
+     */
+    public void setBinnum(String binnum) {
+        this.binnum = binnum == null ? null : binnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.VENDOR
+     *
+     * @return the value of INVENTORY.VENDOR
+     *
+     * @mbg.generated
+     */
+    public String getVendor() {
+        return vendor;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.VENDOR
+     *
+     * @param vendor the value for INVENTORY.VENDOR
+     *
+     * @mbg.generated
+     */
+    public void setVendor(String vendor) {
+        this.vendor = vendor == null ? null : vendor.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.MANUFACTURER
+     *
+     * @return the value of INVENTORY.MANUFACTURER
+     *
+     * @mbg.generated
+     */
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.MANUFACTURER
+     *
+     * @param manufacturer the value for INVENTORY.MANUFACTURER
+     *
+     * @mbg.generated
+     */
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer == null ? null : manufacturer.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.MODELNUM
+     *
+     * @return the value of INVENTORY.MODELNUM
+     *
+     * @mbg.generated
+     */
+    public String getModelnum() {
+        return modelnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.MODELNUM
+     *
+     * @param modelnum the value for INVENTORY.MODELNUM
+     *
+     * @mbg.generated
+     */
+    public void setModelnum(String modelnum) {
+        this.modelnum = modelnum == null ? null : modelnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.MINLEVEL
+     *
+     * @return the value of INVENTORY.MINLEVEL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMinlevel() {
+        return minlevel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.MINLEVEL
+     *
+     * @param minlevel the value for INVENTORY.MINLEVEL
+     *
+     * @mbg.generated
+     */
+    public void setMinlevel(BigDecimal minlevel) {
+        this.minlevel = minlevel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.MAXLEVEL
+     *
+     * @return the value of INVENTORY.MAXLEVEL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMaxlevel() {
+        return maxlevel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.MAXLEVEL
+     *
+     * @param maxlevel the value for INVENTORY.MAXLEVEL
+     *
+     * @mbg.generated
+     */
+    public void setMaxlevel(BigDecimal maxlevel) {
+        this.maxlevel = maxlevel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.STOCKTYPE
+     *
+     * @return the value of INVENTORY.STOCKTYPE
+     *
+     * @mbg.generated
+     */
+    public String getStocktype() {
+        return stocktype;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.STOCKTYPE
+     *
+     * @param stocktype the value for INVENTORY.STOCKTYPE
+     *
+     * @mbg.generated
+     */
+    public void setStocktype(String stocktype) {
+        this.stocktype = stocktype == null ? null : stocktype.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ORDERUNIT
+     *
+     * @return the value of INVENTORY.ORDERUNIT
+     *
+     * @mbg.generated
+     */
+    public String getOrderunit() {
+        return orderunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ORDERUNIT
+     *
+     * @param orderunit the value for INVENTORY.ORDERUNIT
+     *
+     * @mbg.generated
+     */
+    public void setOrderunit(String orderunit) {
+        this.orderunit = orderunit == null ? null : orderunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ISSUEUNIT
+     *
+     * @return the value of INVENTORY.ISSUEUNIT
+     *
+     * @mbg.generated
+     */
+    public String getIssueunit() {
+        return issueunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ISSUEUNIT
+     *
+     * @param issueunit the value for INVENTORY.ISSUEUNIT
+     *
+     * @mbg.generated
+     */
+    public void setIssueunit(String issueunit) {
+        this.issueunit = issueunit == null ? null : issueunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.CONVERSION
+     *
+     * @return the value of INVENTORY.CONVERSION
+     *
+     * @mbg.generated
+     */
+    public Long getConversion() {
+        return conversion;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.CONVERSION
+     *
+     * @param conversion the value for INVENTORY.CONVERSION
+     *
+     * @mbg.generated
+     */
+    public void setConversion(Long conversion) {
+        this.conversion = conversion;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ORDERQTY
+     *
+     * @return the value of INVENTORY.ORDERQTY
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getOrderqty() {
+        return orderqty;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ORDERQTY
+     *
+     * @param orderqty the value for INVENTORY.ORDERQTY
+     *
+     * @mbg.generated
+     */
+    public void setOrderqty(BigDecimal orderqty) {
+        this.orderqty = orderqty;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.STDCOST
+     *
+     * @return the value of INVENTORY.STDCOST
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getStdcost() {
+        return stdcost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.STDCOST
+     *
+     * @param stdcost the value for INVENTORY.STDCOST
+     *
+     * @mbg.generated
+     */
+    public void setStdcost(BigDecimal stdcost) {
+        this.stdcost = stdcost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.AVGCOST
+     *
+     * @return the value of INVENTORY.AVGCOST
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getAvgcost() {
+        return avgcost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.AVGCOST
+     *
+     * @param avgcost the value for INVENTORY.AVGCOST
+     *
+     * @mbg.generated
+     */
+    public void setAvgcost(BigDecimal avgcost) {
+        this.avgcost = avgcost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.LASTCOST
+     *
+     * @return the value of INVENTORY.LASTCOST
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getLastcost() {
+        return lastcost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.LASTCOST
+     *
+     * @param lastcost the value for INVENTORY.LASTCOST
+     *
+     * @mbg.generated
+     */
+    public void setLastcost(BigDecimal lastcost) {
+        this.lastcost = lastcost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.LASTISSUEDATE
+     *
+     * @return the value of INVENTORY.LASTISSUEDATE
+     *
+     * @mbg.generated
+     */
+    public Date getLastissuedate() {
+        return lastissuedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.LASTISSUEDATE
+     *
+     * @param lastissuedate the value for INVENTORY.LASTISSUEDATE
+     *
+     * @mbg.generated
+     */
+    public void setLastissuedate(Date lastissuedate) {
+        this.lastissuedate = lastissuedate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ISSUEYTD
+     *
+     * @return the value of INVENTORY.ISSUEYTD
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getIssueytd() {
+        return issueytd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ISSUEYTD
+     *
+     * @param issueytd the value for INVENTORY.ISSUEYTD
+     *
+     * @mbg.generated
+     */
+    public void setIssueytd(BigDecimal issueytd) {
+        this.issueytd = issueytd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ABCTYPE
+     *
+     * @return the value of INVENTORY.ABCTYPE
+     *
+     * @mbg.generated
+     */
+    public String getAbctype() {
+        return abctype;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ABCTYPE
+     *
+     * @param abctype the value for INVENTORY.ABCTYPE
+     *
+     * @mbg.generated
+     */
+    public void setAbctype(String abctype) {
+        this.abctype = abctype == null ? null : abctype.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.SSTOCK
+     *
+     * @return the value of INVENTORY.SSTOCK
+     *
+     * @mbg.generated
+     */
+    public Long getSstock() {
+        return sstock;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.SSTOCK
+     *
+     * @param sstock the value for INVENTORY.SSTOCK
+     *
+     * @mbg.generated
+     */
+    public void setSstock(Long sstock) {
+        this.sstock = sstock;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.ITEMDESC
+     *
+     * @return the value of INVENTORY.ITEMDESC
+     *
+     * @mbg.generated
+     */
+    public String getItemdesc() {
+        return itemdesc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.ITEMDESC
+     *
+     * @param itemdesc the value for INVENTORY.ITEMDESC
+     *
+     * @mbg.generated
+     */
+    public void setItemdesc(String itemdesc) {
+        this.itemdesc = itemdesc == null ? null : itemdesc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.SITENUM
+     *
+     * @return the value of INVENTORY.SITENUM
+     *
+     * @mbg.generated
+     */
+    public String getSitenum() {
+        return sitenum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.SITENUM
+     *
+     * @param sitenum the value for INVENTORY.SITENUM
+     *
+     * @mbg.generated
+     */
+    public void setSitenum(String sitenum) {
+        this.sitenum = sitenum == null ? null : sitenum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column INVENTORY.CORPNUM
+     *
+     * @return the value of INVENTORY.CORPNUM
+     *
+     * @mbg.generated
+     */
+    public String getCorpnum() {
+        return corpnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column INVENTORY.CORPNUM
+     *
+     * @param corpnum the value for INVENTORY.CORPNUM
+     *
+     * @mbg.generated
+     */
+    public void setCorpnum(String corpnum) {
+        this.corpnum = corpnum == null ? null : corpnum.trim();
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/model/custom/EquoperationrecordVo.java

@@ -0,0 +1,27 @@
+package com.gyee.frame.model.custom;
+
+public class EquoperationrecordVo {
+
+    private String description;
+    private Integer count;
+
+    public EquoperationrecordVo() {
+
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/model/custom/InventoryVo.java

@@ -0,0 +1,35 @@
+package com.gyee.frame.model.custom;
+
+public class InventoryVo {
+
+    private String classid;
+    private Double curbal;
+    private String description;
+
+    public InventoryVo() {
+
+    }
+    public String getClassid() {
+        return classid;
+    }
+
+    public void setClassid(String classid) {
+        this.classid = classid;
+    }
+
+    public Double getCurbal() {
+        return curbal;
+    }
+
+    public void setCurbal(Double curbal) {
+        this.curbal = curbal;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/model/custom/PolineVo.java

@@ -0,0 +1,160 @@
+package com.gyee.frame.model.custom;
+
+import java.util.Date;
+
+public class PolineVo {
+
+    private String ponum;
+    private String status;
+    private Date statusdate;
+    private String vendor;
+    private Double totalcost;
+    private Double totaltax;
+    private String sitenum;
+    private String description;
+    private String itemnum;
+    private String warehouse;
+    private Double orderqty;
+    private String orderunit;
+    private Double unitcost;
+    private Double linecost;
+    private Date enterdate;
+    private String enterby;
+    private String modelnum;
+
+    public String getPonum() {
+        return ponum;
+    }
+
+    public void setPonum(String ponum) {
+        this.ponum = ponum;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Date getStatusdate() {
+        return statusdate;
+    }
+
+    public void setStatusdate(Date statusdate) {
+        this.statusdate = statusdate;
+    }
+
+    public String getVendor() {
+        return vendor;
+    }
+
+    public void setVendor(String vendor) {
+        this.vendor = vendor;
+    }
+
+    public Double getTotalcost() {
+        return totalcost;
+    }
+
+    public void setTotalcost(Double totalcost) {
+        this.totalcost = totalcost;
+    }
+
+    public Double getTotaltax() {
+        return totaltax;
+    }
+
+    public void setTotaltax(Double totaltax) {
+        this.totaltax = totaltax;
+    }
+
+    public String getSitenum() {
+        return sitenum;
+    }
+
+    public void setSitenum(String sitenum) {
+        this.sitenum = sitenum;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getItemnum() {
+        return itemnum;
+    }
+
+    public void setItemnum(String itemnum) {
+        this.itemnum = itemnum;
+    }
+
+    public String getWarehouse() {
+        return warehouse;
+    }
+
+    public void setWarehouse(String warehouse) {
+        this.warehouse = warehouse;
+    }
+
+    public Double getOrderqty() {
+        return orderqty;
+    }
+
+    public void setOrderqty(Double orderqty) {
+        this.orderqty = orderqty;
+    }
+
+    public String getOrderunit() {
+        return orderunit;
+    }
+
+    public void setOrderunit(String orderunit) {
+        this.orderunit = orderunit;
+    }
+
+    public Double getUnitcost() {
+        return unitcost;
+    }
+
+    public void setUnitcost(Double unitcost) {
+        this.unitcost = unitcost;
+    }
+
+    public Double getLinecost() {
+        return linecost;
+    }
+
+    public void setLinecost(Double linecost) {
+        this.linecost = linecost;
+    }
+
+    public Date getEnterdate() {
+        return enterdate;
+    }
+
+    public void setEnterdate(Date enterdate) {
+        this.enterdate = enterdate;
+    }
+
+    public String getEnterby() {
+        return enterby;
+    }
+
+    public void setEnterby(String enterby) {
+        this.enterby = enterby;
+    }
+
+    public String getModelnum() {
+        return modelnum;
+    }
+
+    public void setModelnum(String modelnum) {
+        this.modelnum = modelnum;
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/service/EarlywarningmainService.java

@@ -6,6 +6,7 @@ import com.gyee.frame.mapper.auto.EarlywarningmainMapper;
 import com.gyee.frame.model.auto.Earlywarningmain;
 import com.gyee.frame.model.auto.EarlywarningmainExample;
 import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +25,7 @@ public class EarlywarningmainService implements BaseService<Earlywarningmain, Ea
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				
-			List<Integer> lista=Convert.toIntArrayList(ids);
+			List<String> lista=Convert.toListStrArray(ids);
 			EarlywarningmainExample example=new EarlywarningmainExample();
 			example.createCriteria().andIdIn(lista);
 			return earlywarningmainMapper.deleteByExample(example);
@@ -52,8 +53,8 @@ public class EarlywarningmainService implements BaseService<Earlywarningmain, Ea
 	 */
 	@Override
 	public int insertSelective(Earlywarningmain record) {
-				
 
+        record.setId(SnowflakeIdWorker.getUUID());
 		return earlywarningmainMapper.insertSelective(record);
 	}
 	

web/health-hb/src/main/java/com/gyee/frame/service/EquoperationrecordService.java

@@ -6,6 +6,8 @@ import com.gyee.frame.common.dataSources.DataSource;
 import com.gyee.frame.common.dataSources.DataSourceType;
 import com.gyee.frame.mapper.auto.EquoperationrecordMapper;
 import com.gyee.frame.model.auto.Equoperationrecord;
+import com.gyee.frame.model.custom.EquoperationrecordVo;
+import com.gyee.frame.model.custom.InventoryVo;
 import com.gyee.frame.model.custom.Tablepar;
 import org.springframework.stereotype.Service;
 
@@ -33,5 +35,20 @@ public class EquoperationrecordService {
         return pageInfo;
     }
 
-    
+    @DataSource(value = DataSourceType.TICKET)
+    public List<EquoperationrecordVo> selectEquUpdateCount(String stId) {
+
+
+        List<EquoperationrecordVo> list = equoperationrecordMapper.selectEquUpdateCount(stId);
+
+        return list;
+    }
+    @DataSource(value = DataSourceType.TICKET)
+    public List<InventoryVo> getInventoryClassGroupCount(String stId) {
+
+
+        List<InventoryVo> list = equoperationrecordMapper.getInventoryClassGroupCount(stId);
+
+        return list;
+    }
 }

web/health-hb/src/main/java/com/gyee/frame/service/FailurestatisticsmainService.java

@@ -6,6 +6,7 @@ import com.gyee.frame.mapper.auto.FailurestatisticsmainMapper;
 import com.gyee.frame.model.auto.Failurestatisticsmain;
 import com.gyee.frame.model.auto.FailurestatisticsmainExample;
 import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +25,7 @@ public class FailurestatisticsmainService implements BaseService<Failurestatisti
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				
-			List<Integer> lista=Convert.toIntArrayList(ids);
+			List<String> lista=Convert.toListStrArray(ids);
 			FailurestatisticsmainExample example=new FailurestatisticsmainExample();
 			example.createCriteria().andIdIn(lista);
 			return failurestatisticsmainMapper.deleteByExample(example);
@@ -52,9 +53,9 @@ public class FailurestatisticsmainService implements BaseService<Failurestatisti
 	 */
 	@Override
 	public int insertSelective(Failurestatisticsmain record) {
-				
 
-				
+
+        record.setId(SnowflakeIdWorker.getUUID());
 		return failurestatisticsmainMapper.insertSelective(record);
 	}
 	

web/health-hb/src/main/java/com/gyee/frame/service/PolineSqlService.java

@@ -0,0 +1,108 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.mapper.auto.PolineMapper;
+import com.gyee.frame.model.auto.Poline;
+import com.gyee.frame.model.auto.PolineExample;
+import com.gyee.frame.model.custom.PolineVo;
+import com.gyee.frame.model.custom.Tablepar;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class PolineSqlService implements BaseService<Poline, PolineExample> {
+	@Resource
+	private PolineMapper polineMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+
+
+			return -1;
+
+
+	}
+
+
+	@Override
+	public Poline selectByPrimaryKey(String id) {
+
+        return new Poline();
+
+
+    }
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Poline record) {
+		return polineMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Poline record) {
+				
+			
+				
+		return polineMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Poline record, PolineExample example) {
+		
+		return polineMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Poline record, PolineExample example) {
+		
+		return polineMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Poline> selectByExample(PolineExample example) {
+		
+		return polineMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(PolineExample example) {
+		
+		return polineMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(PolineExample example) {
+		
+		return polineMapper.deleteByExample(example);
+	}
+
+	@DataSource(value = DataSourceType.TICKET)
+    public PageInfo<PolineVo> selectPolinePageList(Tablepar tablepar,String vendor, String warehouse, String ponum, String starttime, String endtime) {
+
+
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+
+
+        List<PolineVo> list = polineMapper.selectPolineList(vendor, warehouse, ponum, starttime, endtime);
+
+        PageInfo<PolineVo> pageInfo = new PageInfo<PolineVo>(list);
+
+        return pageInfo;
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/service/WindturbineSqlService.java

@@ -8,9 +8,9 @@ import com.gyee.frame.mapper.auto.WindturbineSqlMapper;
 import com.gyee.frame.model.auto.WindturbineSql;
 import com.gyee.frame.model.auto.WindturbineSqlExample;
 import com.gyee.frame.util.StringUtils;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -104,7 +104,7 @@ public class WindturbineSqlService implements BaseService<WindturbineSql, Windtu
 
 			WindturbineSqlExample.Criteria criteria =example.createCriteria();
 
-			criteria.andWtnumEqualTo(Double.valueOf(wtnum));
+			criteria.andWtidEqualTo(wtnum);
 
 			List<WindturbineSql> list= windturbineSqlMapper.selectByExample(example);
 

web/health-hb/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -136,50 +136,52 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                         getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
                     }else
                     {
-                        for (PointData snapItem : snapList) {
-
-                            long subTime = snapItem.getPointTime() - pried;
-                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                            // 则代表该时间节点快照有效，否则为0
-                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
-                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                            JSONObject jsonObjectSection = sectionResp.getBody();
-
-                            if (jsonObjectSection != null) {
-                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                                if (sectionlist.size() > 0) {
-                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                        resultList.add(snapItem);
-                                    }
-                                    else{
-                                        PointData data = new PointData();
-                                        data.setEdnaId(point.getCode());
-                                        data.setPointTime(0L);
-                                        data.setPointValue("0");
-                                        data.setPointName("1");
-                                        data.setPointValueInDouble(0.0);
-                                        resultList.add(data);
-                                    }
-                                } else {
-                                    PointData data = new PointData();
-                                    data.setEdnaId(point.getCode());
-                                    data.setPointTime(0l);
-                                    data.setPointValue("0");
-                                    data.setPointName("1");
-                                    data.setPointValueInDouble(0.0);
-                                    resultList.add(data);
-                                }
-                            } else {
-                                PointData data = new PointData();
-                                data.setEdnaId(point.getCode());
-                                data.setPointTime(0l);
-                                data.setPointValue("0");
-                                data.setPointName("1");
-                                data.setPointValueInDouble(0.0);
-                                resultList.add(data);
-                            }
-                        }
+                        resultList=snapList;
+//                        resultList=snapList;
+//                        for (PointData snapItem : snapList) {
+//
+//                            long subTime = snapItem.getPointTime() - pried;
+//                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+//                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+//                            // 则代表该时间节点快照有效，否则为0
+//                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+//                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+//                            JSONObject jsonObjectSection = sectionResp.getBody();
+//
+//                            if (jsonObjectSection != null) {
+//                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+//                                if (sectionlist.size() > 0) {
+//                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+//                                        resultList.add(snapItem);
+//                                    }
+//                                    else{
+//                                        PointData data = new PointData();
+//                                        data.setEdnaId(point.getCode());
+//                                        data.setPointTime(0L);
+//                                        data.setPointValue("0");
+//                                        data.setPointName("1");
+//                                        data.setPointValueInDouble(0.0);
+//                                        resultList.add(data);
+//                                    }
+//                                } else {
+//                                    PointData data = new PointData();
+//                                    data.setEdnaId(point.getCode());
+//                                    data.setPointTime(0l);
+//                                    data.setPointValue("0");
+//                                    data.setPointName("1");
+//                                    data.setPointValueInDouble(0.0);
+//                                    resultList.add(data);
+//                                }
+//                            } else {
+//                                PointData data = new PointData();
+//                                data.setEdnaId(point.getCode());
+//                                data.setPointTime(0l);
+//                                data.setPointValue("0");
+//                                data.setPointName("1");
+//                                data.setPointValueInDouble(0.0);
+//                                resultList.add(data);
+//                            }
+//                        }
                     }
 
 
@@ -424,49 +426,51 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                         getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
                     }else
                     {
-                        for (PointData snapItem : snapList) {
-                            long subTime = snapItem.getPointTime() - pried;
-                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                            // 则代表该时间节点快照有效，否则为0
-                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
-                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                            JSONObject jsonObjectSection = sectionResp.getBody();
-
-                            if (jsonObjectSection != null) {
-                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                                if (sectionlist.size() > 0) {
-                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                        resultList.add(snapItem);
-                                    }
-                                    else{
-                                        PointData data = new PointData();
-                                        data.setEdnaId(point.getCode());
-                                        data.setPointTime(0L);
-                                        data.setPointValue("0");
-                                        data.setPointName("1");
-                                        data.setPointValueInDouble(0.0);
-                                        resultList.add(data);
-                                    }
-                                } else {
-                                    PointData data = new PointData();
-                                    data.setEdnaId(point.getCode());
-                                    data.setPointTime(0l);
-                                    data.setPointValue("0");
-                                    data.setPointName("1");
-                                    data.setPointValueInDouble(0.0);
-                                    resultList.add(data);
-                                }
-                            } else {
-                                PointData data = new PointData();
-                                data.setEdnaId(point.getCode());
-                                data.setPointTime(0l);
-                                data.setPointValue("0");
-                                data.setPointName("1");
-                                data.setPointValueInDouble(0.0);
-                                resultList.add(data);
-                            }
-                        }
+
+                        resultList=snapList;
+//                        for (PointData snapItem : snapList) {
+//                            long subTime = snapItem.getPointTime() - pried;
+//                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+//                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+//                            // 则代表该时间节点快照有效，否则为0
+//                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+//                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+//                            JSONObject jsonObjectSection = sectionResp.getBody();
+//
+//                            if (jsonObjectSection != null) {
+//                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+//                                if (sectionlist.size() > 0) {
+//                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+//                                        resultList.add(snapItem);
+//                                    }
+//                                    else{
+//                                        PointData data = new PointData();
+//                                        data.setEdnaId(point.getCode());
+//                                        data.setPointTime(0L);
+//                                        data.setPointValue("0");
+//                                        data.setPointName("1");
+//                                        data.setPointValueInDouble(0.0);
+//                                        resultList.add(data);
+//                                    }
+//                                } else {
+//                                    PointData data = new PointData();
+//                                    data.setEdnaId(point.getCode());
+//                                    data.setPointTime(0l);
+//                                    data.setPointValue("0");
+//                                    data.setPointName("1");
+//                                    data.setPointValueInDouble(0.0);
+//                                    resultList.add(data);
+//                                }
+//                            } else {
+//                                PointData data = new PointData();
+//                                data.setEdnaId(point.getCode());
+//                                data.setPointTime(0l);
+//                                data.setPointValue("0");
+//                                data.setPointName("1");
+//                                data.setPointValueInDouble(0.0);
+//                                resultList.add(data);
+//                            }
+//                        }
                     }
 
 
@@ -611,7 +615,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     idls.add(str);
                 }
             }
-            if(!idls.isEmpty()  )
+            if(!idls.isEmpty() )
             {
                 String pointIdString = StringUtil.join(idls.toArray(), ",");
                 Optional<String> keys = Optional.ofNullable(pointIdString);
@@ -626,32 +630,25 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     JSONObject jsonObject = resp.getBody();
                     if (jsonObject != null) {
                         //对结果进行有序返回
-                        int len = idls.size();
+                        int len = pointids.length;
                         List<PointData> result = new ArrayList<>();
                         HashMap<String, PointData> pointDataHashMap = new HashMap<>();
                         for (int i = 0; i < len; i++) {
 
 
-                            PointData pd = new PointData();
-                            pd.setPointName(pointids[i]);
-                            pd.setEdnaId(pointids[i]);
-                            pd.setPointValueInDouble(0.0);
-                            pd.setPointTime(0l);
-                            result.add(pd);
-
-                            pointDataHashMap.put(pd.getPointName(), pd);
+                            if (pointDataHashMap.containsKey(pointids[i]) == false){
+                                PointData pd = new PointData();
+                                pd.setPointName(pointids[i]);
+                                pd.setEdnaId(pointids[i]);
+                                pd.setPointValueInDouble(0.0);
+                                pd.setPointTime(0l);
+                                result.add(pd);
 
-//                            if (pointDataHashMap.containsKey(idls.get(i)) == false){
-//                                PointData pd = new PointData();
-//                                pd.setPointName(idls.get(i));
-//                                pd.setEdnaId(idls.get(i));
-//                                result.add(pd);
-//
-//                                pointDataHashMap.put(pd.getPointName(), pd);
-//                            }
-//                            else{
-//                                result.add(pointDataHashMap.get(idls.get(i)));
-//                            }
+                                pointDataHashMap.put(pd.getPointName(), pd);
+                            }
+                            else{
+                                result.add(pointDataHashMap.get(pointids[i]));
+                            }
 
                         }
                         Iterator<String> sIterator = jsonObject.keySet().iterator();
@@ -780,27 +777,19 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                         HashMap<String, PointData> pointDataHashMap = new HashMap<>();
                         for (int i = 0; i < len; i++) {
 
-                            PointData pd = new PointData();
-                            pd.setPointName(pointids.get(i));
-                            pd.setEdnaId(pointids.get(i));
-                            pd.setPointValueInDouble(0.0);
-                            pd.setPointTime(0l);
-                            result.add(pd);
-
-                            pointDataHashMap.put(pd.getPointName(), pd);
-
+                            if (pointDataHashMap.containsKey(pointids.get(i)) == false){
+                                PointData pd = new PointData();
+                                pd.setPointName(pointids.get(i));
+                                pd.setEdnaId(pointids.get(i));
+                                pd.setPointValueInDouble(0.0);
+                                pd.setPointTime(0l);
+                                result.add(pd);
 
-//                            if (pointDataHashMap.containsKey(idls.get(i)) == false){
-//                                PointData pd = new PointData();
-//                                pd.setPointName(idls.get(i));
-//                                pd.setEdnaId(idls.get(i));
-//                                result.add(pd);
-//
-//                                pointDataHashMap.put(pd.getPointName(), pd);
-//                            }
-//                            else{
-//                                result.add(pointDataHashMap.get(idls.get(i)));
-//                            }
+                                pointDataHashMap.put(pd.getPointName(), pd);
+                            }
+                            else{
+                                result.add(pointDataHashMap.get(pointids.get(i)));
+                            }
                         }
                         Iterator<String> sIterator = jsonObject.keySet().iterator();
                         while (sIterator.hasNext()) {
@@ -1018,49 +1007,51 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                         getHistsnapSameTiem(pointid, beginDate, pried, resultList);
                     }else
                     {
-                        for (PointData snapItem : list) {
-                            long subTime = snapItem.getPointTime() - pried;
-                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                            // 则代表该时间节点快照有效，否则为0
-                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" +pointid+ "&ts=" + snapItem.getPointTime() + "000";
-                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                            JSONObject jsonObjectSection = sectionResp.getBody();
-
-                            if (jsonObjectSection != null) {
-                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                                if (sectionlist.size() > 0) {
-                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                        resultList.add(snapItem);
-                                    }
-                                    else{
-                                        PointData data = new PointData();
-                                        data.setEdnaId(pointid);
-                                        data.setPointTime(0L);
-                                        data.setPointValue("0");
-                                        data.setPointName("1");
-                                        data.setPointValueInDouble(0.0);
-                                        resultList.add(data);
-                                    }
-                                } else {
-                                    PointData data = new PointData();
-                                    data.setEdnaId(pointid);
-                                    data.setPointTime(0l);
-                                    data.setPointValue("0");
-                                    data.setPointName("1");
-                                    data.setPointValueInDouble(0.0);
-                                    resultList.add(data);
-                                }
-                            } else {
-                                PointData data = new PointData();
-                                data.setEdnaId(pointid);
-                                data.setPointTime(0l);
-                                data.setPointValue("0");
-                                data.setPointName("1");
-                                data.setPointValueInDouble(0.0);
-                                resultList.add(data);
-                            }
-                        }
+
+                        resultList=list;
+//                        for (PointData snapItem : list) {
+//                            long subTime = snapItem.getPointTime() - pried;
+//                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+//                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+//                            // 则代表该时间节点快照有效，否则为0
+//                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" +pointid+ "&ts=" + snapItem.getPointTime() + "000";
+//                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+//                            JSONObject jsonObjectSection = sectionResp.getBody();
+//
+//                            if (jsonObjectSection != null) {
+//                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+//                                if (sectionlist.size() > 0) {
+//                                    if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+//                                        resultList.add(snapItem);
+//                                    }
+//                                    else{
+//                                        PointData data = new PointData();
+//                                        data.setEdnaId(pointid);
+//                                        data.setPointTime(0L);
+//                                        data.setPointValue("0");
+//                                        data.setPointName("1");
+//                                        data.setPointValueInDouble(0.0);
+//                                        resultList.add(data);
+//                                    }
+//                                } else {
+//                                    PointData data = new PointData();
+//                                    data.setEdnaId(pointid);
+//                                    data.setPointTime(0l);
+//                                    data.setPointValue("0");
+//                                    data.setPointName("1");
+//                                    data.setPointValueInDouble(0.0);
+//                                    resultList.add(data);
+//                                }
+//                            } else {
+//                                PointData data = new PointData();
+//                                data.setEdnaId(pointid);
+//                                data.setPointTime(0l);
+//                                data.setPointValue("0");
+//                                data.setPointName("1");
+//                                data.setPointValueInDouble(0.0);
+//                                resultList.add(data);
+//                            }
+//                        }
                     }
 
                     return resultList;
@@ -1660,4 +1651,4 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     }
 
 
-}
+}

web/health-hb/src/main/resources/mybatis-generator.xml

@@ -110,7 +110,7 @@
 <!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
-        <table tableName='Warehouse' domainObjectName='Warehouse'/>
+        <table tableName='Inventory' domainObjectName='Inventory'/>
 
 
     </context>

web/health-hb/src/main/resources/mybatis/auto/EarlywarningmainMapper.xml

@@ -6,7 +6,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
     <result column="RECODEDATE" jdbcType="TIMESTAMP" property="recodedate" />
     <result column="WPID" jdbcType="VARCHAR" property="wpid" />
     <result column="WPNAME" jdbcType="VARCHAR" property="wpname" />
@@ -153,7 +153,7 @@
     select 
     <include refid="Base_Column_List" />
     from EARLYWARNINGMAIN
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     <!--
@@ -161,7 +161,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from EARLYWARNINGMAIN
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.EarlywarningmainExample">
     <!--
@@ -490,7 +490,7 @@
     update EARLYWARNINGMAIN
     <set>
       <if test="record.id != null">
-        ID = #{record.id,jdbcType=DECIMAL},
+        ID = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.recodedate != null">
         RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
@@ -626,7 +626,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update EARLYWARNINGMAIN
-    set ID = #{record.id,jdbcType=DECIMAL},
+    set ID = #{record.id,jdbcType=VARCHAR},
       RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
       WPID = #{record.wpid,jdbcType=VARCHAR},
       WPNAME = #{record.wpname,jdbcType=VARCHAR},
@@ -803,7 +803,7 @@
         DAY1TOPNUM = #{day1topnum,jdbcType=DECIMAL},
       </if>
     </set>
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Earlywarningmain">
     <!--
@@ -852,7 +852,7 @@
       DAY1TOP2NAME = #{day1top2name,jdbcType=VARCHAR},
       DAY1TOP3NAME = #{day1top3name,jdbcType=VARCHAR},
       DAY1TOPNUM = #{day1topnum,jdbcType=DECIMAL}
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
 
 

web/health-hb/src/main/resources/mybatis/auto/EquoperationrecordMapper.xml

@@ -7,24 +7,24 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="ID" jdbcType="NUMERIC" property="id" />
-    <result column="TYPE" jdbcType="NVARCHAR" property="type" />
-    <result column="FROMLOC" jdbcType="NVARCHAR" property="fromloc" />
-    <result column="TOLOC" jdbcType="NVARCHAR" property="toloc" />
-    <result column="LEADER" jdbcType="NVARCHAR" property="leader" />
-    <result column="OPERATIONLOG" jdbcType="NVARCHAR" property="operationlog" />
+    <result column="TYPE" jdbcType="VARCHAR" property="type" />
+    <result column="FROMLOC" jdbcType="VARCHAR" property="fromloc" />
+    <result column="TOLOC" jdbcType="VARCHAR" property="toloc" />
+    <result column="LEADER" jdbcType="VARCHAR" property="leader" />
+    <result column="OPERATIONLOG" jdbcType="VARCHAR" property="operationlog" />
     <result column="STARTTIME" jdbcType="TIMESTAMP" property="starttime" />
     <result column="ENDTIME" jdbcType="TIMESTAMP" property="endtime" />
-    <result column="WONUM" jdbcType="NVARCHAR" property="wonum" />
-    <result column="FROMLOCDES" jdbcType="NVARCHAR" property="fromlocdes" />
-    <result column="TOLOCDES" jdbcType="NVARCHAR" property="tolocdes" />
-    <result column="TYPECODE" jdbcType="NVARCHAR" property="typecode" />
-    <result column="WTNUM" jdbcType="NVARCHAR" property="wtnum" />
-    <result column="EQNUM" jdbcType="NVARCHAR" property="eqnum" />
-    <result column="PROBLEM" jdbcType="NVARCHAR" property="problem" />
-    <result column="SOLVEWAY" jdbcType="NVARCHAR" property="solveway" />
-    <result column="RESERVE1" jdbcType="NVARCHAR" property="reserve1" />
-    <result column="RESERVE2" jdbcType="NVARCHAR" property="reserve2" />
-    <result column="RESERVE3" jdbcType="NVARCHAR" property="reserve3" />
+    <result column="WONUM" jdbcType="VARCHAR" property="wonum" />
+    <result column="FROMLOCDES" jdbcType="VARCHAR" property="fromlocdes" />
+    <result column="TOLOCDES" jdbcType="VARCHAR" property="tolocdes" />
+    <result column="TYPECODE" jdbcType="VARCHAR" property="typecode" />
+    <result column="WTNUM" jdbcType="VARCHAR" property="wtnum" />
+    <result column="EQNUM" jdbcType="VARCHAR" property="eqnum" />
+    <result column="PROBLEM" jdbcType="VARCHAR" property="problem" />
+    <result column="SOLVEWAY" jdbcType="VARCHAR" property="solveway" />
+    <result column="RESERVE1" jdbcType="VARCHAR" property="reserve1" />
+    <result column="RESERVE2" jdbcType="VARCHAR" property="reserve2" />
+    <result column="RESERVE3" jdbcType="VARCHAR" property="reserve3" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -158,13 +158,13 @@
       WTNUM, EQNUM, PROBLEM, 
       SOLVEWAY, RESERVE1, RESERVE2, 
       RESERVE3)
-    values (#{id,jdbcType=NUMERIC}, #{type,jdbcType=NVARCHAR}, #{fromloc,jdbcType=NVARCHAR}, 
-      #{toloc,jdbcType=NVARCHAR}, #{leader,jdbcType=NVARCHAR}, #{operationlog,jdbcType=NVARCHAR}, 
-      #{starttime,jdbcType=TIMESTAMP}, #{endtime,jdbcType=TIMESTAMP}, #{wonum,jdbcType=NVARCHAR}, 
-      #{fromlocdes,jdbcType=NVARCHAR}, #{tolocdes,jdbcType=NVARCHAR}, #{typecode,jdbcType=NVARCHAR}, 
-      #{wtnum,jdbcType=NVARCHAR}, #{eqnum,jdbcType=NVARCHAR}, #{problem,jdbcType=NVARCHAR}, 
-      #{solveway,jdbcType=NVARCHAR}, #{reserve1,jdbcType=NVARCHAR}, #{reserve2,jdbcType=NVARCHAR}, 
-      #{reserve3,jdbcType=NVARCHAR})
+    values (#{id,jdbcType=NUMERIC}, #{type,jdbcType=VARCHAR}, #{fromloc,jdbcType=VARCHAR}, 
+      #{toloc,jdbcType=VARCHAR}, #{leader,jdbcType=VARCHAR}, #{operationlog,jdbcType=VARCHAR}, 
+      #{starttime,jdbcType=TIMESTAMP}, #{endtime,jdbcType=TIMESTAMP}, #{wonum,jdbcType=VARCHAR}, 
+      #{fromlocdes,jdbcType=VARCHAR}, #{tolocdes,jdbcType=VARCHAR}, #{typecode,jdbcType=VARCHAR}, 
+      #{wtnum,jdbcType=VARCHAR}, #{eqnum,jdbcType=VARCHAR}, #{problem,jdbcType=VARCHAR}, 
+      #{solveway,jdbcType=VARCHAR}, #{reserve1,jdbcType=VARCHAR}, #{reserve2,jdbcType=VARCHAR}, 
+      #{reserve3,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Equoperationrecord">
     <!--
@@ -236,19 +236,19 @@
         #{id,jdbcType=NUMERIC},
       </if>
       <if test="type != null">
-        #{type,jdbcType=NVARCHAR},
+        #{type,jdbcType=VARCHAR},
       </if>
       <if test="fromloc != null">
-        #{fromloc,jdbcType=NVARCHAR},
+        #{fromloc,jdbcType=VARCHAR},
       </if>
       <if test="toloc != null">
-        #{toloc,jdbcType=NVARCHAR},
+        #{toloc,jdbcType=VARCHAR},
       </if>
       <if test="leader != null">
-        #{leader,jdbcType=NVARCHAR},
+        #{leader,jdbcType=VARCHAR},
       </if>
       <if test="operationlog != null">
-        #{operationlog,jdbcType=NVARCHAR},
+        #{operationlog,jdbcType=VARCHAR},
       </if>
       <if test="starttime != null">
         #{starttime,jdbcType=TIMESTAMP},
@@ -257,37 +257,37 @@
         #{endtime,jdbcType=TIMESTAMP},
       </if>
       <if test="wonum != null">
-        #{wonum,jdbcType=NVARCHAR},
+        #{wonum,jdbcType=VARCHAR},
       </if>
       <if test="fromlocdes != null">
-        #{fromlocdes,jdbcType=NVARCHAR},
+        #{fromlocdes,jdbcType=VARCHAR},
       </if>
       <if test="tolocdes != null">
-        #{tolocdes,jdbcType=NVARCHAR},
+        #{tolocdes,jdbcType=VARCHAR},
       </if>
       <if test="typecode != null">
-        #{typecode,jdbcType=NVARCHAR},
+        #{typecode,jdbcType=VARCHAR},
       </if>
       <if test="wtnum != null">
-        #{wtnum,jdbcType=NVARCHAR},
+        #{wtnum,jdbcType=VARCHAR},
       </if>
       <if test="eqnum != null">
-        #{eqnum,jdbcType=NVARCHAR},
+        #{eqnum,jdbcType=VARCHAR},
       </if>
       <if test="problem != null">
-        #{problem,jdbcType=NVARCHAR},
+        #{problem,jdbcType=VARCHAR},
       </if>
       <if test="solveway != null">
-        #{solveway,jdbcType=NVARCHAR},
+        #{solveway,jdbcType=VARCHAR},
       </if>
       <if test="reserve1 != null">
-        #{reserve1,jdbcType=NVARCHAR},
+        #{reserve1,jdbcType=VARCHAR},
       </if>
       <if test="reserve2 != null">
-        #{reserve2,jdbcType=NVARCHAR},
+        #{reserve2,jdbcType=VARCHAR},
       </if>
       <if test="reserve3 != null">
-        #{reserve3,jdbcType=NVARCHAR},
+        #{reserve3,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -312,19 +312,19 @@
         ID = #{record.id,jdbcType=NUMERIC},
       </if>
       <if test="record.type != null">
-        TYPE = #{record.type,jdbcType=NVARCHAR},
+        TYPE = #{record.type,jdbcType=VARCHAR},
       </if>
       <if test="record.fromloc != null">
-        FROMLOC = #{record.fromloc,jdbcType=NVARCHAR},
+        FROMLOC = #{record.fromloc,jdbcType=VARCHAR},
       </if>
       <if test="record.toloc != null">
-        TOLOC = #{record.toloc,jdbcType=NVARCHAR},
+        TOLOC = #{record.toloc,jdbcType=VARCHAR},
       </if>
       <if test="record.leader != null">
-        LEADER = #{record.leader,jdbcType=NVARCHAR},
+        LEADER = #{record.leader,jdbcType=VARCHAR},
       </if>
       <if test="record.operationlog != null">
-        OPERATIONLOG = #{record.operationlog,jdbcType=NVARCHAR},
+        OPERATIONLOG = #{record.operationlog,jdbcType=VARCHAR},
       </if>
       <if test="record.starttime != null">
         STARTTIME = #{record.starttime,jdbcType=TIMESTAMP},
@@ -333,37 +333,37 @@
         ENDTIME = #{record.endtime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.wonum != null">
-        WONUM = #{record.wonum,jdbcType=NVARCHAR},
+        WONUM = #{record.wonum,jdbcType=VARCHAR},
       </if>
       <if test="record.fromlocdes != null">
-        FROMLOCDES = #{record.fromlocdes,jdbcType=NVARCHAR},
+        FROMLOCDES = #{record.fromlocdes,jdbcType=VARCHAR},
       </if>
       <if test="record.tolocdes != null">
-        TOLOCDES = #{record.tolocdes,jdbcType=NVARCHAR},
+        TOLOCDES = #{record.tolocdes,jdbcType=VARCHAR},
       </if>
       <if test="record.typecode != null">
-        TYPECODE = #{record.typecode,jdbcType=NVARCHAR},
+        TYPECODE = #{record.typecode,jdbcType=VARCHAR},
       </if>
       <if test="record.wtnum != null">
-        WTNUM = #{record.wtnum,jdbcType=NVARCHAR},
+        WTNUM = #{record.wtnum,jdbcType=VARCHAR},
       </if>
       <if test="record.eqnum != null">
-        EQNUM = #{record.eqnum,jdbcType=NVARCHAR},
+        EQNUM = #{record.eqnum,jdbcType=VARCHAR},
       </if>
       <if test="record.problem != null">
-        PROBLEM = #{record.problem,jdbcType=NVARCHAR},
+        PROBLEM = #{record.problem,jdbcType=VARCHAR},
       </if>
       <if test="record.solveway != null">
-        SOLVEWAY = #{record.solveway,jdbcType=NVARCHAR},
+        SOLVEWAY = #{record.solveway,jdbcType=VARCHAR},
       </if>
       <if test="record.reserve1 != null">
-        RESERVE1 = #{record.reserve1,jdbcType=NVARCHAR},
+        RESERVE1 = #{record.reserve1,jdbcType=VARCHAR},
       </if>
       <if test="record.reserve2 != null">
-        RESERVE2 = #{record.reserve2,jdbcType=NVARCHAR},
+        RESERVE2 = #{record.reserve2,jdbcType=VARCHAR},
       </if>
       <if test="record.reserve3 != null">
-        RESERVE3 = #{record.reserve3,jdbcType=NVARCHAR},
+        RESERVE3 = #{record.reserve3,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -377,24 +377,24 @@
     -->
     update EQUOPERATIONRECORD
     set ID = #{record.id,jdbcType=NUMERIC},
-      TYPE = #{record.type,jdbcType=NVARCHAR},
-      FROMLOC = #{record.fromloc,jdbcType=NVARCHAR},
-      TOLOC = #{record.toloc,jdbcType=NVARCHAR},
-      LEADER = #{record.leader,jdbcType=NVARCHAR},
-      OPERATIONLOG = #{record.operationlog,jdbcType=NVARCHAR},
+      TYPE = #{record.type,jdbcType=VARCHAR},
+      FROMLOC = #{record.fromloc,jdbcType=VARCHAR},
+      TOLOC = #{record.toloc,jdbcType=VARCHAR},
+      LEADER = #{record.leader,jdbcType=VARCHAR},
+      OPERATIONLOG = #{record.operationlog,jdbcType=VARCHAR},
       STARTTIME = #{record.starttime,jdbcType=TIMESTAMP},
       ENDTIME = #{record.endtime,jdbcType=TIMESTAMP},
-      WONUM = #{record.wonum,jdbcType=NVARCHAR},
-      FROMLOCDES = #{record.fromlocdes,jdbcType=NVARCHAR},
-      TOLOCDES = #{record.tolocdes,jdbcType=NVARCHAR},
-      TYPECODE = #{record.typecode,jdbcType=NVARCHAR},
-      WTNUM = #{record.wtnum,jdbcType=NVARCHAR},
-      EQNUM = #{record.eqnum,jdbcType=NVARCHAR},
-      PROBLEM = #{record.problem,jdbcType=NVARCHAR},
-      SOLVEWAY = #{record.solveway,jdbcType=NVARCHAR},
-      RESERVE1 = #{record.reserve1,jdbcType=NVARCHAR},
-      RESERVE2 = #{record.reserve2,jdbcType=NVARCHAR},
-      RESERVE3 = #{record.reserve3,jdbcType=NVARCHAR}
+      WONUM = #{record.wonum,jdbcType=VARCHAR},
+      FROMLOCDES = #{record.fromlocdes,jdbcType=VARCHAR},
+      TOLOCDES = #{record.tolocdes,jdbcType=VARCHAR},
+      TYPECODE = #{record.typecode,jdbcType=VARCHAR},
+      WTNUM = #{record.wtnum,jdbcType=VARCHAR},
+      EQNUM = #{record.eqnum,jdbcType=VARCHAR},
+      PROBLEM = #{record.problem,jdbcType=VARCHAR},
+      SOLVEWAY = #{record.solveway,jdbcType=VARCHAR},
+      RESERVE1 = #{record.reserve1,jdbcType=VARCHAR},
+      RESERVE2 = #{record.reserve2,jdbcType=VARCHAR},
+      RESERVE3 = #{record.reserve3,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -407,19 +407,19 @@
     update EQUOPERATIONRECORD
     <set>
       <if test="type != null">
-        TYPE = #{type,jdbcType=NVARCHAR},
+        TYPE = #{type,jdbcType=VARCHAR},
       </if>
       <if test="fromloc != null">
-        FROMLOC = #{fromloc,jdbcType=NVARCHAR},
+        FROMLOC = #{fromloc,jdbcType=VARCHAR},
       </if>
       <if test="toloc != null">
-        TOLOC = #{toloc,jdbcType=NVARCHAR},
+        TOLOC = #{toloc,jdbcType=VARCHAR},
       </if>
       <if test="leader != null">
-        LEADER = #{leader,jdbcType=NVARCHAR},
+        LEADER = #{leader,jdbcType=VARCHAR},
       </if>
       <if test="operationlog != null">
-        OPERATIONLOG = #{operationlog,jdbcType=NVARCHAR},
+        OPERATIONLOG = #{operationlog,jdbcType=VARCHAR},
       </if>
       <if test="starttime != null">
         STARTTIME = #{starttime,jdbcType=TIMESTAMP},
@@ -428,37 +428,37 @@
         ENDTIME = #{endtime,jdbcType=TIMESTAMP},
       </if>
       <if test="wonum != null">
-        WONUM = #{wonum,jdbcType=NVARCHAR},
+        WONUM = #{wonum,jdbcType=VARCHAR},
       </if>
       <if test="fromlocdes != null">
-        FROMLOCDES = #{fromlocdes,jdbcType=NVARCHAR},
+        FROMLOCDES = #{fromlocdes,jdbcType=VARCHAR},
       </if>
       <if test="tolocdes != null">
-        TOLOCDES = #{tolocdes,jdbcType=NVARCHAR},
+        TOLOCDES = #{tolocdes,jdbcType=VARCHAR},
       </if>
       <if test="typecode != null">
-        TYPECODE = #{typecode,jdbcType=NVARCHAR},
+        TYPECODE = #{typecode,jdbcType=VARCHAR},
       </if>
       <if test="wtnum != null">
-        WTNUM = #{wtnum,jdbcType=NVARCHAR},
+        WTNUM = #{wtnum,jdbcType=VARCHAR},
       </if>
       <if test="eqnum != null">
-        EQNUM = #{eqnum,jdbcType=NVARCHAR},
+        EQNUM = #{eqnum,jdbcType=VARCHAR},
       </if>
       <if test="problem != null">
-        PROBLEM = #{problem,jdbcType=NVARCHAR},
+        PROBLEM = #{problem,jdbcType=VARCHAR},
       </if>
       <if test="solveway != null">
-        SOLVEWAY = #{solveway,jdbcType=NVARCHAR},
+        SOLVEWAY = #{solveway,jdbcType=VARCHAR},
       </if>
       <if test="reserve1 != null">
-        RESERVE1 = #{reserve1,jdbcType=NVARCHAR},
+        RESERVE1 = #{reserve1,jdbcType=VARCHAR},
       </if>
       <if test="reserve2 != null">
-        RESERVE2 = #{reserve2,jdbcType=NVARCHAR},
+        RESERVE2 = #{reserve2,jdbcType=VARCHAR},
       </if>
       <if test="reserve3 != null">
-        RESERVE3 = #{reserve3,jdbcType=NVARCHAR},
+        RESERVE3 = #{reserve3,jdbcType=VARCHAR},
       </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
@@ -469,24 +469,24 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update EQUOPERATIONRECORD
-    set TYPE = #{type,jdbcType=NVARCHAR},
-      FROMLOC = #{fromloc,jdbcType=NVARCHAR},
-      TOLOC = #{toloc,jdbcType=NVARCHAR},
-      LEADER = #{leader,jdbcType=NVARCHAR},
-      OPERATIONLOG = #{operationlog,jdbcType=NVARCHAR},
+    set TYPE = #{type,jdbcType=VARCHAR},
+      FROMLOC = #{fromloc,jdbcType=VARCHAR},
+      TOLOC = #{toloc,jdbcType=VARCHAR},
+      LEADER = #{leader,jdbcType=VARCHAR},
+      OPERATIONLOG = #{operationlog,jdbcType=VARCHAR},
       STARTTIME = #{starttime,jdbcType=TIMESTAMP},
       ENDTIME = #{endtime,jdbcType=TIMESTAMP},
-      WONUM = #{wonum,jdbcType=NVARCHAR},
-      FROMLOCDES = #{fromlocdes,jdbcType=NVARCHAR},
-      TOLOCDES = #{tolocdes,jdbcType=NVARCHAR},
-      TYPECODE = #{typecode,jdbcType=NVARCHAR},
-      WTNUM = #{wtnum,jdbcType=NVARCHAR},
-      EQNUM = #{eqnum,jdbcType=NVARCHAR},
-      PROBLEM = #{problem,jdbcType=NVARCHAR},
-      SOLVEWAY = #{solveway,jdbcType=NVARCHAR},
-      RESERVE1 = #{reserve1,jdbcType=NVARCHAR},
-      RESERVE2 = #{reserve2,jdbcType=NVARCHAR},
-      RESERVE3 = #{reserve3,jdbcType=NVARCHAR}
+      WONUM = #{wonum,jdbcType=VARCHAR},
+      FROMLOCDES = #{fromlocdes,jdbcType=VARCHAR},
+      TOLOCDES = #{tolocdes,jdbcType=VARCHAR},
+      TYPECODE = #{typecode,jdbcType=VARCHAR},
+      WTNUM = #{wtnum,jdbcType=VARCHAR},
+      EQNUM = #{eqnum,jdbcType=VARCHAR},
+      PROBLEM = #{problem,jdbcType=VARCHAR},
+      SOLVEWAY = #{solveway,jdbcType=VARCHAR},
+      RESERVE1 = #{reserve1,jdbcType=VARCHAR},
+      RESERVE2 = #{reserve2,jdbcType=VARCHAR},
+      RESERVE3 = #{reserve3,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
 
@@ -523,4 +523,60 @@
 
     </select>
 
+    <resultMap id="EquoperationrecordMap" type="com.gyee.frame.model.custom.EquoperationrecordVo">
+
+        <result column="count" jdbcType="NUMERIC" property="count" />
+        <result column="description" jdbcType="VARCHAR" property="description" />
+
+
+    </resultMap>
+    <select id="selectEquUpdateCount" resultMap="EquoperationrecordMap">
+        select
+        l.description,count(l.description) as count
+        from
+        equoperationrecord e
+
+        left join equipment  l on e.toloc = l.location
+        left join workticket w on w.wonum = e.wonum
+        left join windfarm f on  w.workdept = f.wfname
+         and  f.wpid =#{stId,jdbcType=NVARCHAR}
+        group by l.description
+
+    </select>
+
+
+    <resultMap id="InventoryMap" type="com.gyee.frame.model.custom.InventoryVo">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        <result column="classid" jdbcType="VARCHAR" property="classid" />
+        <result column="curbal" jdbcType="NUMERIC" property="curbal" />
+        <result column="description" jdbcType="VARCHAR" property="description" />
+
+
+    </resultMap>
+    <select id="getInventoryClassGroupCount" resultMap="InventoryMap">
+
+        with t as (
+        select
+        y.itemnum,
+        c.classid,
+        c.description,
+        k.curbal,
+        y.sitenum,
+        w.wfshortname
+        from
+        inventory y
+        left join invstock k on y.itemnum = k.itemnum
+        left join item m on m.itemnum = y.itemnum
+        left join classification c on c.classid = m.classid
+        left join windfarm w on w.wfname = y.sitenum
+         and  w.wpid  = #{stId,jdbcType=NVARCHAR}
+        )
+        select classid, sum (t.curbal) curbal, t.description from t
+        group by t.classid, t.description
+
+
+    </select>
 </mapper>

web/health-hb/src/main/resources/mybatis/auto/FailurestatisticsmainMapper.xml

@@ -6,7 +6,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
     <result column="RECODEDATE" jdbcType="TIMESTAMP" property="recodedate" />
     <result column="WPID" jdbcType="VARCHAR" property="wpid" />
     <result column="WPNAME" jdbcType="VARCHAR" property="wpname" />
@@ -153,7 +153,7 @@
     select 
     <include refid="Base_Column_List" />
     from FAILURESTATISTICSMAIN
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     <!--
@@ -161,7 +161,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from FAILURESTATISTICSMAIN
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.FailurestatisticsmainExample">
     <!--
@@ -490,7 +490,7 @@
     update FAILURESTATISTICSMAIN
     <set>
       <if test="record.id != null">
-        ID = #{record.id,jdbcType=DECIMAL},
+        ID = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.recodedate != null">
         RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
@@ -626,7 +626,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update FAILURESTATISTICSMAIN
-    set ID = #{record.id,jdbcType=DECIMAL},
+    set ID = #{record.id,jdbcType=VARCHAR},
       RECODEDATE = #{record.recodedate,jdbcType=TIMESTAMP},
       WPID = #{record.wpid,jdbcType=VARCHAR},
       WPNAME = #{record.wpname,jdbcType=VARCHAR},
@@ -803,7 +803,7 @@
         DAY1TOPNUM = #{day1topnum,jdbcType=DECIMAL},
       </if>
     </set>
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Failurestatisticsmain">
     <!--
@@ -852,7 +852,7 @@
       DAY1TOP2NAME = #{day1top2name,jdbcType=VARCHAR},
       DAY1TOP3NAME = #{day1top3name,jdbcType=VARCHAR},
       DAY1TOPNUM = #{day1topnum,jdbcType=DECIMAL}
-    where ID = #{id,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
 
     <select id="listFailure" resultMap="BaseResultMap">

web/health-hb/src/main/resources/mybatis/auto/InventoryMapper.xml

@@ -0,0 +1,572 @@
+<?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.InventoryMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Inventory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="NUMERIC" property="id" />
+    <result column="ITEMNUM" jdbcType="NVARCHAR" property="itemnum" />
+    <result column="WAREHOUSE" jdbcType="NVARCHAR" property="warehouse" />
+    <result column="BINNUM" jdbcType="NVARCHAR" property="binnum" />
+    <result column="VENDOR" jdbcType="NVARCHAR" property="vendor" />
+    <result column="MANUFACTURER" jdbcType="NVARCHAR" property="manufacturer" />
+    <result column="MODELNUM" jdbcType="NVARCHAR" property="modelnum" />
+    <result column="MINLEVEL" jdbcType="NUMERIC" property="minlevel" />
+    <result column="MAXLEVEL" jdbcType="NUMERIC" property="maxlevel" />
+    <result column="STOCKTYPE" jdbcType="NVARCHAR" property="stocktype" />
+    <result column="ORDERUNIT" jdbcType="NVARCHAR" property="orderunit" />
+    <result column="ISSUEUNIT" jdbcType="NVARCHAR" property="issueunit" />
+    <result column="CONVERSION" jdbcType="NUMERIC" property="conversion" />
+    <result column="ORDERQTY" jdbcType="NUMERIC" property="orderqty" />
+    <result column="STDCOST" jdbcType="NUMERIC" property="stdcost" />
+    <result column="AVGCOST" jdbcType="NUMERIC" property="avgcost" />
+    <result column="LASTCOST" jdbcType="NUMERIC" property="lastcost" />
+    <result column="LASTISSUEDATE" jdbcType="TIMESTAMP" property="lastissuedate" />
+    <result column="ISSUEYTD" jdbcType="NUMERIC" property="issueytd" />
+    <result column="ABCTYPE" jdbcType="NVARCHAR" property="abctype" />
+    <result column="SSTOCK" jdbcType="NUMERIC" property="sstock" />
+    <result column="ITEMDESC" jdbcType="NVARCHAR" property="itemdesc" />
+    <result column="SITENUM" jdbcType="NVARCHAR" property="sitenum" />
+    <result column="CORPNUM" jdbcType="NVARCHAR" property="corpnum" />
+  </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, ITEMNUM, WAREHOUSE, BINNUM, VENDOR, MANUFACTURER, MODELNUM, MINLEVEL, MAXLEVEL, 
+    STOCKTYPE, ORDERUNIT, ISSUEUNIT, CONVERSION, ORDERQTY, STDCOST, AVGCOST, LASTCOST, 
+    LASTISSUEDATE, ISSUEYTD, ABCTYPE, SSTOCK, ITEMDESC, SITENUM, CORPNUM
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.InventoryExample" 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 INVENTORY
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from INVENTORY
+    where ID = #{id,jdbcType=NUMERIC}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from INVENTORY
+    where ID = #{id,jdbcType=NUMERIC}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.InventoryExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from INVENTORY
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Inventory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into INVENTORY (ID, ITEMNUM, WAREHOUSE, 
+      BINNUM, VENDOR, MANUFACTURER, 
+      MODELNUM, MINLEVEL, MAXLEVEL, 
+      STOCKTYPE, ORDERUNIT, ISSUEUNIT, 
+      CONVERSION, ORDERQTY, STDCOST, 
+      AVGCOST, LASTCOST, LASTISSUEDATE, 
+      ISSUEYTD, ABCTYPE, SSTOCK, 
+      ITEMDESC, SITENUM, CORPNUM
+      )
+    values (#{id,jdbcType=NUMERIC}, #{itemnum,jdbcType=NVARCHAR}, #{warehouse,jdbcType=NVARCHAR}, 
+      #{binnum,jdbcType=NVARCHAR}, #{vendor,jdbcType=NVARCHAR}, #{manufacturer,jdbcType=NVARCHAR}, 
+      #{modelnum,jdbcType=NVARCHAR}, #{minlevel,jdbcType=NUMERIC}, #{maxlevel,jdbcType=NUMERIC}, 
+      #{stocktype,jdbcType=NVARCHAR}, #{orderunit,jdbcType=NVARCHAR}, #{issueunit,jdbcType=NVARCHAR}, 
+      #{conversion,jdbcType=NUMERIC}, #{orderqty,jdbcType=NUMERIC}, #{stdcost,jdbcType=NUMERIC}, 
+      #{avgcost,jdbcType=NUMERIC}, #{lastcost,jdbcType=NUMERIC}, #{lastissuedate,jdbcType=TIMESTAMP}, 
+      #{issueytd,jdbcType=NUMERIC}, #{abctype,jdbcType=NVARCHAR}, #{sstock,jdbcType=NUMERIC}, 
+      #{itemdesc,jdbcType=NVARCHAR}, #{sitenum,jdbcType=NVARCHAR}, #{corpnum,jdbcType=NVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Inventory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into INVENTORY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="itemnum != null">
+        ITEMNUM,
+      </if>
+      <if test="warehouse != null">
+        WAREHOUSE,
+      </if>
+      <if test="binnum != null">
+        BINNUM,
+      </if>
+      <if test="vendor != null">
+        VENDOR,
+      </if>
+      <if test="manufacturer != null">
+        MANUFACTURER,
+      </if>
+      <if test="modelnum != null">
+        MODELNUM,
+      </if>
+      <if test="minlevel != null">
+        MINLEVEL,
+      </if>
+      <if test="maxlevel != null">
+        MAXLEVEL,
+      </if>
+      <if test="stocktype != null">
+        STOCKTYPE,
+      </if>
+      <if test="orderunit != null">
+        ORDERUNIT,
+      </if>
+      <if test="issueunit != null">
+        ISSUEUNIT,
+      </if>
+      <if test="conversion != null">
+        CONVERSION,
+      </if>
+      <if test="orderqty != null">
+        ORDERQTY,
+      </if>
+      <if test="stdcost != null">
+        STDCOST,
+      </if>
+      <if test="avgcost != null">
+        AVGCOST,
+      </if>
+      <if test="lastcost != null">
+        LASTCOST,
+      </if>
+      <if test="lastissuedate != null">
+        LASTISSUEDATE,
+      </if>
+      <if test="issueytd != null">
+        ISSUEYTD,
+      </if>
+      <if test="abctype != null">
+        ABCTYPE,
+      </if>
+      <if test="sstock != null">
+        SSTOCK,
+      </if>
+      <if test="itemdesc != null">
+        ITEMDESC,
+      </if>
+      <if test="sitenum != null">
+        SITENUM,
+      </if>
+      <if test="corpnum != null">
+        CORPNUM,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=NUMERIC},
+      </if>
+      <if test="itemnum != null">
+        #{itemnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="warehouse != null">
+        #{warehouse,jdbcType=NVARCHAR},
+      </if>
+      <if test="binnum != null">
+        #{binnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="vendor != null">
+        #{vendor,jdbcType=NVARCHAR},
+      </if>
+      <if test="manufacturer != null">
+        #{manufacturer,jdbcType=NVARCHAR},
+      </if>
+      <if test="modelnum != null">
+        #{modelnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="minlevel != null">
+        #{minlevel,jdbcType=NUMERIC},
+      </if>
+      <if test="maxlevel != null">
+        #{maxlevel,jdbcType=NUMERIC},
+      </if>
+      <if test="stocktype != null">
+        #{stocktype,jdbcType=NVARCHAR},
+      </if>
+      <if test="orderunit != null">
+        #{orderunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="issueunit != null">
+        #{issueunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="conversion != null">
+        #{conversion,jdbcType=NUMERIC},
+      </if>
+      <if test="orderqty != null">
+        #{orderqty,jdbcType=NUMERIC},
+      </if>
+      <if test="stdcost != null">
+        #{stdcost,jdbcType=NUMERIC},
+      </if>
+      <if test="avgcost != null">
+        #{avgcost,jdbcType=NUMERIC},
+      </if>
+      <if test="lastcost != null">
+        #{lastcost,jdbcType=NUMERIC},
+      </if>
+      <if test="lastissuedate != null">
+        #{lastissuedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="issueytd != null">
+        #{issueytd,jdbcType=NUMERIC},
+      </if>
+      <if test="abctype != null">
+        #{abctype,jdbcType=NVARCHAR},
+      </if>
+      <if test="sstock != null">
+        #{sstock,jdbcType=NUMERIC},
+      </if>
+      <if test="itemdesc != null">
+        #{itemdesc,jdbcType=NVARCHAR},
+      </if>
+      <if test="sitenum != null">
+        #{sitenum,jdbcType=NVARCHAR},
+      </if>
+      <if test="corpnum != null">
+        #{corpnum,jdbcType=NVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.InventoryExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from INVENTORY
+    <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 INVENTORY
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=NUMERIC},
+      </if>
+      <if test="record.itemnum != null">
+        ITEMNUM = #{record.itemnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.warehouse != null">
+        WAREHOUSE = #{record.warehouse,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.binnum != null">
+        BINNUM = #{record.binnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.vendor != null">
+        VENDOR = #{record.vendor,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.manufacturer != null">
+        MANUFACTURER = #{record.manufacturer,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.modelnum != null">
+        MODELNUM = #{record.modelnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.minlevel != null">
+        MINLEVEL = #{record.minlevel,jdbcType=NUMERIC},
+      </if>
+      <if test="record.maxlevel != null">
+        MAXLEVEL = #{record.maxlevel,jdbcType=NUMERIC},
+      </if>
+      <if test="record.stocktype != null">
+        STOCKTYPE = #{record.stocktype,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.orderunit != null">
+        ORDERUNIT = #{record.orderunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.issueunit != null">
+        ISSUEUNIT = #{record.issueunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.conversion != null">
+        CONVERSION = #{record.conversion,jdbcType=NUMERIC},
+      </if>
+      <if test="record.orderqty != null">
+        ORDERQTY = #{record.orderqty,jdbcType=NUMERIC},
+      </if>
+      <if test="record.stdcost != null">
+        STDCOST = #{record.stdcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.avgcost != null">
+        AVGCOST = #{record.avgcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.lastcost != null">
+        LASTCOST = #{record.lastcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.lastissuedate != null">
+        LASTISSUEDATE = #{record.lastissuedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.issueytd != null">
+        ISSUEYTD = #{record.issueytd,jdbcType=NUMERIC},
+      </if>
+      <if test="record.abctype != null">
+        ABCTYPE = #{record.abctype,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.sstock != null">
+        SSTOCK = #{record.sstock,jdbcType=NUMERIC},
+      </if>
+      <if test="record.itemdesc != null">
+        ITEMDESC = #{record.itemdesc,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.sitenum != null">
+        SITENUM = #{record.sitenum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.corpnum != null">
+        CORPNUM = #{record.corpnum,jdbcType=NVARCHAR},
+      </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 INVENTORY
+    set ID = #{record.id,jdbcType=NUMERIC},
+      ITEMNUM = #{record.itemnum,jdbcType=NVARCHAR},
+      WAREHOUSE = #{record.warehouse,jdbcType=NVARCHAR},
+      BINNUM = #{record.binnum,jdbcType=NVARCHAR},
+      VENDOR = #{record.vendor,jdbcType=NVARCHAR},
+      MANUFACTURER = #{record.manufacturer,jdbcType=NVARCHAR},
+      MODELNUM = #{record.modelnum,jdbcType=NVARCHAR},
+      MINLEVEL = #{record.minlevel,jdbcType=NUMERIC},
+      MAXLEVEL = #{record.maxlevel,jdbcType=NUMERIC},
+      STOCKTYPE = #{record.stocktype,jdbcType=NVARCHAR},
+      ORDERUNIT = #{record.orderunit,jdbcType=NVARCHAR},
+      ISSUEUNIT = #{record.issueunit,jdbcType=NVARCHAR},
+      CONVERSION = #{record.conversion,jdbcType=NUMERIC},
+      ORDERQTY = #{record.orderqty,jdbcType=NUMERIC},
+      STDCOST = #{record.stdcost,jdbcType=NUMERIC},
+      AVGCOST = #{record.avgcost,jdbcType=NUMERIC},
+      LASTCOST = #{record.lastcost,jdbcType=NUMERIC},
+      LASTISSUEDATE = #{record.lastissuedate,jdbcType=TIMESTAMP},
+      ISSUEYTD = #{record.issueytd,jdbcType=NUMERIC},
+      ABCTYPE = #{record.abctype,jdbcType=NVARCHAR},
+      SSTOCK = #{record.sstock,jdbcType=NUMERIC},
+      ITEMDESC = #{record.itemdesc,jdbcType=NVARCHAR},
+      SITENUM = #{record.sitenum,jdbcType=NVARCHAR},
+      CORPNUM = #{record.corpnum,jdbcType=NVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Inventory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update INVENTORY
+    <set>
+      <if test="itemnum != null">
+        ITEMNUM = #{itemnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="warehouse != null">
+        WAREHOUSE = #{warehouse,jdbcType=NVARCHAR},
+      </if>
+      <if test="binnum != null">
+        BINNUM = #{binnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="vendor != null">
+        VENDOR = #{vendor,jdbcType=NVARCHAR},
+      </if>
+      <if test="manufacturer != null">
+        MANUFACTURER = #{manufacturer,jdbcType=NVARCHAR},
+      </if>
+      <if test="modelnum != null">
+        MODELNUM = #{modelnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="minlevel != null">
+        MINLEVEL = #{minlevel,jdbcType=NUMERIC},
+      </if>
+      <if test="maxlevel != null">
+        MAXLEVEL = #{maxlevel,jdbcType=NUMERIC},
+      </if>
+      <if test="stocktype != null">
+        STOCKTYPE = #{stocktype,jdbcType=NVARCHAR},
+      </if>
+      <if test="orderunit != null">
+        ORDERUNIT = #{orderunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="issueunit != null">
+        ISSUEUNIT = #{issueunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="conversion != null">
+        CONVERSION = #{conversion,jdbcType=NUMERIC},
+      </if>
+      <if test="orderqty != null">
+        ORDERQTY = #{orderqty,jdbcType=NUMERIC},
+      </if>
+      <if test="stdcost != null">
+        STDCOST = #{stdcost,jdbcType=NUMERIC},
+      </if>
+      <if test="avgcost != null">
+        AVGCOST = #{avgcost,jdbcType=NUMERIC},
+      </if>
+      <if test="lastcost != null">
+        LASTCOST = #{lastcost,jdbcType=NUMERIC},
+      </if>
+      <if test="lastissuedate != null">
+        LASTISSUEDATE = #{lastissuedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="issueytd != null">
+        ISSUEYTD = #{issueytd,jdbcType=NUMERIC},
+      </if>
+      <if test="abctype != null">
+        ABCTYPE = #{abctype,jdbcType=NVARCHAR},
+      </if>
+      <if test="sstock != null">
+        SSTOCK = #{sstock,jdbcType=NUMERIC},
+      </if>
+      <if test="itemdesc != null">
+        ITEMDESC = #{itemdesc,jdbcType=NVARCHAR},
+      </if>
+      <if test="sitenum != null">
+        SITENUM = #{sitenum,jdbcType=NVARCHAR},
+      </if>
+      <if test="corpnum != null">
+        CORPNUM = #{corpnum,jdbcType=NVARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Inventory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update INVENTORY
+    set ITEMNUM = #{itemnum,jdbcType=NVARCHAR},
+      WAREHOUSE = #{warehouse,jdbcType=NVARCHAR},
+      BINNUM = #{binnum,jdbcType=NVARCHAR},
+      VENDOR = #{vendor,jdbcType=NVARCHAR},
+      MANUFACTURER = #{manufacturer,jdbcType=NVARCHAR},
+      MODELNUM = #{modelnum,jdbcType=NVARCHAR},
+      MINLEVEL = #{minlevel,jdbcType=NUMERIC},
+      MAXLEVEL = #{maxlevel,jdbcType=NUMERIC},
+      STOCKTYPE = #{stocktype,jdbcType=NVARCHAR},
+      ORDERUNIT = #{orderunit,jdbcType=NVARCHAR},
+      ISSUEUNIT = #{issueunit,jdbcType=NVARCHAR},
+      CONVERSION = #{conversion,jdbcType=NUMERIC},
+      ORDERQTY = #{orderqty,jdbcType=NUMERIC},
+      STDCOST = #{stdcost,jdbcType=NUMERIC},
+      AVGCOST = #{avgcost,jdbcType=NUMERIC},
+      LASTCOST = #{lastcost,jdbcType=NUMERIC},
+      LASTISSUEDATE = #{lastissuedate,jdbcType=TIMESTAMP},
+      ISSUEYTD = #{issueytd,jdbcType=NUMERIC},
+      ABCTYPE = #{abctype,jdbcType=NVARCHAR},
+      SSTOCK = #{sstock,jdbcType=NUMERIC},
+      ITEMDESC = #{itemdesc,jdbcType=NVARCHAR},
+      SITENUM = #{sitenum,jdbcType=NVARCHAR},
+      CORPNUM = #{corpnum,jdbcType=NVARCHAR}
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+</mapper>

web/health-hb/src/main/resources/mybatis/auto/PolineMapper.xml

@@ -0,0 +1,867 @@
+<?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.PolineMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Poline">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="NUMERIC" property="id" />
+    <result column="PONUM" jdbcType="NVARCHAR" property="ponum" />
+    <result column="POLINENUM" jdbcType="NUMERIC" property="polinenum" />
+    <result column="ITEMNUM" jdbcType="NVARCHAR" property="itemnum" />
+    <result column="DESCRIPTION" jdbcType="NVARCHAR" property="description" />
+    <result column="WAREHOUSE" jdbcType="NVARCHAR" property="warehouse" />
+    <result column="ORDERQTY" jdbcType="NUMERIC" property="orderqty" />
+    <result column="ORDERUNIT" jdbcType="NVARCHAR" property="orderunit" />
+    <result column="CONVERSION" jdbcType="NUMERIC" property="conversion" />
+    <result column="UNITCOST" jdbcType="NUMERIC" property="unitcost" />
+    <result column="TAXUNITCOST" jdbcType="NUMERIC" property="taxunitcost" />
+    <result column="LINECOST" jdbcType="NUMERIC" property="linecost" />
+    <result column="TAXLINECOST" jdbcType="NUMERIC" property="taxlinecost" />
+    <result column="RECEIVEDQTY" jdbcType="NUMERIC" property="receivedqty" />
+    <result column="RECEIVEDUNITCOST" jdbcType="NUMERIC" property="receivedunitcost" />
+    <result column="RECEIVEDTOTALCOST" jdbcType="NUMERIC" property="receivedtotalcost" />
+    <result column="TAXCODE" jdbcType="NVARCHAR" property="taxcode" />
+    <result column="TAXRATE" jdbcType="NUMERIC" property="taxrate" />
+    <result column="TAX" jdbcType="NUMERIC" property="tax" />
+    <result column="REJECTEDQTY" jdbcType="NUMERIC" property="rejectedqty" />
+    <result column="VENDELIVERYDATE" jdbcType="TIMESTAMP" property="vendeliverydate" />
+    <result column="ENTERDATE" jdbcType="TIMESTAMP" property="enterdate" />
+    <result column="ENTERBY" jdbcType="NVARCHAR" property="enterby" />
+    <result column="REQUESTEDBY" jdbcType="NVARCHAR" property="requestedby" />
+    <result column="REQDELIVERYDATE" jdbcType="TIMESTAMP" property="reqdeliverydate" />
+    <result column="MANUFACTURER" jdbcType="NVARCHAR" property="manufacturer" />
+    <result column="MODELNUM" jdbcType="NVARCHAR" property="modelnum" />
+    <result column="SERVICE" jdbcType="NVARCHAR" property="service" />
+    <result column="STOCKTYPE" jdbcType="NVARCHAR" property="stocktype" />
+    <result column="REMARK" jdbcType="NVARCHAR" property="remark" />
+    <result column="LOCATION" jdbcType="NVARCHAR" property="location" />
+    <result column="RECEIPTSCOMPLETE" jdbcType="NVARCHAR" property="receiptscomplete" />
+    <result column="INSPECTION" jdbcType="NVARCHAR" property="inspection" />
+    <result column="LOADEDCOST" jdbcType="NUMERIC" property="loadedcost" />
+    <result column="PRORATED" jdbcType="NVARCHAR" property="prorated" />
+    <result column="PRORATECOST" jdbcType="NUMERIC" property="proratecost" />
+    <result column="WONUM" jdbcType="NVARCHAR" property="wonum" />
+    <result column="TASKNUM" jdbcType="NVARCHAR" property="tasknum" />
+    <result column="BUDNUM" jdbcType="NVARCHAR" property="budnum" />
+    <result column="BUDITEM" jdbcType="NVARCHAR" property="buditem" />
+  </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, PONUM, POLINENUM, ITEMNUM, DESCRIPTION, WAREHOUSE, ORDERQTY, ORDERUNIT, CONVERSION, 
+    UNITCOST, TAXUNITCOST, LINECOST, TAXLINECOST, RECEIVEDQTY, RECEIVEDUNITCOST, RECEIVEDTOTALCOST, 
+    TAXCODE, TAXRATE, TAX, REJECTEDQTY, VENDELIVERYDATE, ENTERDATE, ENTERBY, REQUESTEDBY, 
+    REQDELIVERYDATE, MANUFACTURER, MODELNUM, SERVICE, STOCKTYPE, REMARK, LOCATION, RECEIPTSCOMPLETE, 
+    INSPECTION, LOADEDCOST, PRORATED, PRORATECOST, WONUM, TASKNUM, BUDNUM, BUDITEM
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.PolineExample" 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 POLINE
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from POLINE
+    where ID = #{id,jdbcType=NUMERIC}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from POLINE
+    where ID = #{id,jdbcType=NUMERIC}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.PolineExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from POLINE
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Poline">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into POLINE (ID, PONUM, POLINENUM, 
+      ITEMNUM, DESCRIPTION, WAREHOUSE, 
+      ORDERQTY, ORDERUNIT, CONVERSION, 
+      UNITCOST, TAXUNITCOST, LINECOST, 
+      TAXLINECOST, RECEIVEDQTY, RECEIVEDUNITCOST, 
+      RECEIVEDTOTALCOST, TAXCODE, TAXRATE, 
+      TAX, REJECTEDQTY, VENDELIVERYDATE, 
+      ENTERDATE, ENTERBY, REQUESTEDBY, 
+      REQDELIVERYDATE, MANUFACTURER, MODELNUM, 
+      SERVICE, STOCKTYPE, REMARK, 
+      LOCATION, RECEIPTSCOMPLETE, INSPECTION, 
+      LOADEDCOST, PRORATED, PRORATECOST, 
+      WONUM, TASKNUM, BUDNUM, 
+      BUDITEM)
+    values (#{id,jdbcType=NUMERIC}, #{ponum,jdbcType=NVARCHAR}, #{polinenum,jdbcType=NUMERIC}, 
+      #{itemnum,jdbcType=NVARCHAR}, #{description,jdbcType=NVARCHAR}, #{warehouse,jdbcType=NVARCHAR}, 
+      #{orderqty,jdbcType=NUMERIC}, #{orderunit,jdbcType=NVARCHAR}, #{conversion,jdbcType=NUMERIC}, 
+      #{unitcost,jdbcType=NUMERIC}, #{taxunitcost,jdbcType=NUMERIC}, #{linecost,jdbcType=NUMERIC}, 
+      #{taxlinecost,jdbcType=NUMERIC}, #{receivedqty,jdbcType=NUMERIC}, #{receivedunitcost,jdbcType=NUMERIC}, 
+      #{receivedtotalcost,jdbcType=NUMERIC}, #{taxcode,jdbcType=NVARCHAR}, #{taxrate,jdbcType=NUMERIC}, 
+      #{tax,jdbcType=NUMERIC}, #{rejectedqty,jdbcType=NUMERIC}, #{vendeliverydate,jdbcType=TIMESTAMP}, 
+      #{enterdate,jdbcType=TIMESTAMP}, #{enterby,jdbcType=NVARCHAR}, #{requestedby,jdbcType=NVARCHAR}, 
+      #{reqdeliverydate,jdbcType=TIMESTAMP}, #{manufacturer,jdbcType=NVARCHAR}, #{modelnum,jdbcType=NVARCHAR}, 
+      #{service,jdbcType=NVARCHAR}, #{stocktype,jdbcType=NVARCHAR}, #{remark,jdbcType=NVARCHAR}, 
+      #{location,jdbcType=NVARCHAR}, #{receiptscomplete,jdbcType=NVARCHAR}, #{inspection,jdbcType=NVARCHAR}, 
+      #{loadedcost,jdbcType=NUMERIC}, #{prorated,jdbcType=NVARCHAR}, #{proratecost,jdbcType=NUMERIC}, 
+      #{wonum,jdbcType=NVARCHAR}, #{tasknum,jdbcType=NVARCHAR}, #{budnum,jdbcType=NVARCHAR}, 
+      #{buditem,jdbcType=NVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Poline">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into POLINE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="ponum != null">
+        PONUM,
+      </if>
+      <if test="polinenum != null">
+        POLINENUM,
+      </if>
+      <if test="itemnum != null">
+        ITEMNUM,
+      </if>
+      <if test="description != null">
+        DESCRIPTION,
+      </if>
+      <if test="warehouse != null">
+        WAREHOUSE,
+      </if>
+      <if test="orderqty != null">
+        ORDERQTY,
+      </if>
+      <if test="orderunit != null">
+        ORDERUNIT,
+      </if>
+      <if test="conversion != null">
+        CONVERSION,
+      </if>
+      <if test="unitcost != null">
+        UNITCOST,
+      </if>
+      <if test="taxunitcost != null">
+        TAXUNITCOST,
+      </if>
+      <if test="linecost != null">
+        LINECOST,
+      </if>
+      <if test="taxlinecost != null">
+        TAXLINECOST,
+      </if>
+      <if test="receivedqty != null">
+        RECEIVEDQTY,
+      </if>
+      <if test="receivedunitcost != null">
+        RECEIVEDUNITCOST,
+      </if>
+      <if test="receivedtotalcost != null">
+        RECEIVEDTOTALCOST,
+      </if>
+      <if test="taxcode != null">
+        TAXCODE,
+      </if>
+      <if test="taxrate != null">
+        TAXRATE,
+      </if>
+      <if test="tax != null">
+        TAX,
+      </if>
+      <if test="rejectedqty != null">
+        REJECTEDQTY,
+      </if>
+      <if test="vendeliverydate != null">
+        VENDELIVERYDATE,
+      </if>
+      <if test="enterdate != null">
+        ENTERDATE,
+      </if>
+      <if test="enterby != null">
+        ENTERBY,
+      </if>
+      <if test="requestedby != null">
+        REQUESTEDBY,
+      </if>
+      <if test="reqdeliverydate != null">
+        REQDELIVERYDATE,
+      </if>
+      <if test="manufacturer != null">
+        MANUFACTURER,
+      </if>
+      <if test="modelnum != null">
+        MODELNUM,
+      </if>
+      <if test="service != null">
+        SERVICE,
+      </if>
+      <if test="stocktype != null">
+        STOCKTYPE,
+      </if>
+      <if test="remark != null">
+        REMARK,
+      </if>
+      <if test="location != null">
+        LOCATION,
+      </if>
+      <if test="receiptscomplete != null">
+        RECEIPTSCOMPLETE,
+      </if>
+      <if test="inspection != null">
+        INSPECTION,
+      </if>
+      <if test="loadedcost != null">
+        LOADEDCOST,
+      </if>
+      <if test="prorated != null">
+        PRORATED,
+      </if>
+      <if test="proratecost != null">
+        PRORATECOST,
+      </if>
+      <if test="wonum != null">
+        WONUM,
+      </if>
+      <if test="tasknum != null">
+        TASKNUM,
+      </if>
+      <if test="budnum != null">
+        BUDNUM,
+      </if>
+      <if test="buditem != null">
+        BUDITEM,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=NUMERIC},
+      </if>
+      <if test="ponum != null">
+        #{ponum,jdbcType=NVARCHAR},
+      </if>
+      <if test="polinenum != null">
+        #{polinenum,jdbcType=NUMERIC},
+      </if>
+      <if test="itemnum != null">
+        #{itemnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=NVARCHAR},
+      </if>
+      <if test="warehouse != null">
+        #{warehouse,jdbcType=NVARCHAR},
+      </if>
+      <if test="orderqty != null">
+        #{orderqty,jdbcType=NUMERIC},
+      </if>
+      <if test="orderunit != null">
+        #{orderunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="conversion != null">
+        #{conversion,jdbcType=NUMERIC},
+      </if>
+      <if test="unitcost != null">
+        #{unitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="taxunitcost != null">
+        #{taxunitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="linecost != null">
+        #{linecost,jdbcType=NUMERIC},
+      </if>
+      <if test="taxlinecost != null">
+        #{taxlinecost,jdbcType=NUMERIC},
+      </if>
+      <if test="receivedqty != null">
+        #{receivedqty,jdbcType=NUMERIC},
+      </if>
+      <if test="receivedunitcost != null">
+        #{receivedunitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="receivedtotalcost != null">
+        #{receivedtotalcost,jdbcType=NUMERIC},
+      </if>
+      <if test="taxcode != null">
+        #{taxcode,jdbcType=NVARCHAR},
+      </if>
+      <if test="taxrate != null">
+        #{taxrate,jdbcType=NUMERIC},
+      </if>
+      <if test="tax != null">
+        #{tax,jdbcType=NUMERIC},
+      </if>
+      <if test="rejectedqty != null">
+        #{rejectedqty,jdbcType=NUMERIC},
+      </if>
+      <if test="vendeliverydate != null">
+        #{vendeliverydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="enterdate != null">
+        #{enterdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="enterby != null">
+        #{enterby,jdbcType=NVARCHAR},
+      </if>
+      <if test="requestedby != null">
+        #{requestedby,jdbcType=NVARCHAR},
+      </if>
+      <if test="reqdeliverydate != null">
+        #{reqdeliverydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="manufacturer != null">
+        #{manufacturer,jdbcType=NVARCHAR},
+      </if>
+      <if test="modelnum != null">
+        #{modelnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="service != null">
+        #{service,jdbcType=NVARCHAR},
+      </if>
+      <if test="stocktype != null">
+        #{stocktype,jdbcType=NVARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=NVARCHAR},
+      </if>
+      <if test="location != null">
+        #{location,jdbcType=NVARCHAR},
+      </if>
+      <if test="receiptscomplete != null">
+        #{receiptscomplete,jdbcType=NVARCHAR},
+      </if>
+      <if test="inspection != null">
+        #{inspection,jdbcType=NVARCHAR},
+      </if>
+      <if test="loadedcost != null">
+        #{loadedcost,jdbcType=NUMERIC},
+      </if>
+      <if test="prorated != null">
+        #{prorated,jdbcType=NVARCHAR},
+      </if>
+      <if test="proratecost != null">
+        #{proratecost,jdbcType=NUMERIC},
+      </if>
+      <if test="wonum != null">
+        #{wonum,jdbcType=NVARCHAR},
+      </if>
+      <if test="tasknum != null">
+        #{tasknum,jdbcType=NVARCHAR},
+      </if>
+      <if test="budnum != null">
+        #{budnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="buditem != null">
+        #{buditem,jdbcType=NVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.PolineExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from POLINE
+    <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 POLINE
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=NUMERIC},
+      </if>
+      <if test="record.ponum != null">
+        PONUM = #{record.ponum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.polinenum != null">
+        POLINENUM = #{record.polinenum,jdbcType=NUMERIC},
+      </if>
+      <if test="record.itemnum != null">
+        ITEMNUM = #{record.itemnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.description != null">
+        DESCRIPTION = #{record.description,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.warehouse != null">
+        WAREHOUSE = #{record.warehouse,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.orderqty != null">
+        ORDERQTY = #{record.orderqty,jdbcType=NUMERIC},
+      </if>
+      <if test="record.orderunit != null">
+        ORDERUNIT = #{record.orderunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.conversion != null">
+        CONVERSION = #{record.conversion,jdbcType=NUMERIC},
+      </if>
+      <if test="record.unitcost != null">
+        UNITCOST = #{record.unitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.taxunitcost != null">
+        TAXUNITCOST = #{record.taxunitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.linecost != null">
+        LINECOST = #{record.linecost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.taxlinecost != null">
+        TAXLINECOST = #{record.taxlinecost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.receivedqty != null">
+        RECEIVEDQTY = #{record.receivedqty,jdbcType=NUMERIC},
+      </if>
+      <if test="record.receivedunitcost != null">
+        RECEIVEDUNITCOST = #{record.receivedunitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.receivedtotalcost != null">
+        RECEIVEDTOTALCOST = #{record.receivedtotalcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.taxcode != null">
+        TAXCODE = #{record.taxcode,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.taxrate != null">
+        TAXRATE = #{record.taxrate,jdbcType=NUMERIC},
+      </if>
+      <if test="record.tax != null">
+        TAX = #{record.tax,jdbcType=NUMERIC},
+      </if>
+      <if test="record.rejectedqty != null">
+        REJECTEDQTY = #{record.rejectedqty,jdbcType=NUMERIC},
+      </if>
+      <if test="record.vendeliverydate != null">
+        VENDELIVERYDATE = #{record.vendeliverydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.enterdate != null">
+        ENTERDATE = #{record.enterdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.enterby != null">
+        ENTERBY = #{record.enterby,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.requestedby != null">
+        REQUESTEDBY = #{record.requestedby,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.reqdeliverydate != null">
+        REQDELIVERYDATE = #{record.reqdeliverydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.manufacturer != null">
+        MANUFACTURER = #{record.manufacturer,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.modelnum != null">
+        MODELNUM = #{record.modelnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.service != null">
+        SERVICE = #{record.service,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.stocktype != null">
+        STOCKTYPE = #{record.stocktype,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.remark != null">
+        REMARK = #{record.remark,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.location != null">
+        LOCATION = #{record.location,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.receiptscomplete != null">
+        RECEIPTSCOMPLETE = #{record.receiptscomplete,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.inspection != null">
+        INSPECTION = #{record.inspection,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.loadedcost != null">
+        LOADEDCOST = #{record.loadedcost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.prorated != null">
+        PRORATED = #{record.prorated,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.proratecost != null">
+        PRORATECOST = #{record.proratecost,jdbcType=NUMERIC},
+      </if>
+      <if test="record.wonum != null">
+        WONUM = #{record.wonum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.tasknum != null">
+        TASKNUM = #{record.tasknum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.budnum != null">
+        BUDNUM = #{record.budnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.buditem != null">
+        BUDITEM = #{record.buditem,jdbcType=NVARCHAR},
+      </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 POLINE
+    set ID = #{record.id,jdbcType=NUMERIC},
+      PONUM = #{record.ponum,jdbcType=NVARCHAR},
+      POLINENUM = #{record.polinenum,jdbcType=NUMERIC},
+      ITEMNUM = #{record.itemnum,jdbcType=NVARCHAR},
+      DESCRIPTION = #{record.description,jdbcType=NVARCHAR},
+      WAREHOUSE = #{record.warehouse,jdbcType=NVARCHAR},
+      ORDERQTY = #{record.orderqty,jdbcType=NUMERIC},
+      ORDERUNIT = #{record.orderunit,jdbcType=NVARCHAR},
+      CONVERSION = #{record.conversion,jdbcType=NUMERIC},
+      UNITCOST = #{record.unitcost,jdbcType=NUMERIC},
+      TAXUNITCOST = #{record.taxunitcost,jdbcType=NUMERIC},
+      LINECOST = #{record.linecost,jdbcType=NUMERIC},
+      TAXLINECOST = #{record.taxlinecost,jdbcType=NUMERIC},
+      RECEIVEDQTY = #{record.receivedqty,jdbcType=NUMERIC},
+      RECEIVEDUNITCOST = #{record.receivedunitcost,jdbcType=NUMERIC},
+      RECEIVEDTOTALCOST = #{record.receivedtotalcost,jdbcType=NUMERIC},
+      TAXCODE = #{record.taxcode,jdbcType=NVARCHAR},
+      TAXRATE = #{record.taxrate,jdbcType=NUMERIC},
+      TAX = #{record.tax,jdbcType=NUMERIC},
+      REJECTEDQTY = #{record.rejectedqty,jdbcType=NUMERIC},
+      VENDELIVERYDATE = #{record.vendeliverydate,jdbcType=TIMESTAMP},
+      ENTERDATE = #{record.enterdate,jdbcType=TIMESTAMP},
+      ENTERBY = #{record.enterby,jdbcType=NVARCHAR},
+      REQUESTEDBY = #{record.requestedby,jdbcType=NVARCHAR},
+      REQDELIVERYDATE = #{record.reqdeliverydate,jdbcType=TIMESTAMP},
+      MANUFACTURER = #{record.manufacturer,jdbcType=NVARCHAR},
+      MODELNUM = #{record.modelnum,jdbcType=NVARCHAR},
+      SERVICE = #{record.service,jdbcType=NVARCHAR},
+      STOCKTYPE = #{record.stocktype,jdbcType=NVARCHAR},
+      REMARK = #{record.remark,jdbcType=NVARCHAR},
+      LOCATION = #{record.location,jdbcType=NVARCHAR},
+      RECEIPTSCOMPLETE = #{record.receiptscomplete,jdbcType=NVARCHAR},
+      INSPECTION = #{record.inspection,jdbcType=NVARCHAR},
+      LOADEDCOST = #{record.loadedcost,jdbcType=NUMERIC},
+      PRORATED = #{record.prorated,jdbcType=NVARCHAR},
+      PRORATECOST = #{record.proratecost,jdbcType=NUMERIC},
+      WONUM = #{record.wonum,jdbcType=NVARCHAR},
+      TASKNUM = #{record.tasknum,jdbcType=NVARCHAR},
+      BUDNUM = #{record.budnum,jdbcType=NVARCHAR},
+      BUDITEM = #{record.buditem,jdbcType=NVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Poline">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update POLINE
+    <set>
+      <if test="ponum != null">
+        PONUM = #{ponum,jdbcType=NVARCHAR},
+      </if>
+      <if test="polinenum != null">
+        POLINENUM = #{polinenum,jdbcType=NUMERIC},
+      </if>
+      <if test="itemnum != null">
+        ITEMNUM = #{itemnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="description != null">
+        DESCRIPTION = #{description,jdbcType=NVARCHAR},
+      </if>
+      <if test="warehouse != null">
+        WAREHOUSE = #{warehouse,jdbcType=NVARCHAR},
+      </if>
+      <if test="orderqty != null">
+        ORDERQTY = #{orderqty,jdbcType=NUMERIC},
+      </if>
+      <if test="orderunit != null">
+        ORDERUNIT = #{orderunit,jdbcType=NVARCHAR},
+      </if>
+      <if test="conversion != null">
+        CONVERSION = #{conversion,jdbcType=NUMERIC},
+      </if>
+      <if test="unitcost != null">
+        UNITCOST = #{unitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="taxunitcost != null">
+        TAXUNITCOST = #{taxunitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="linecost != null">
+        LINECOST = #{linecost,jdbcType=NUMERIC},
+      </if>
+      <if test="taxlinecost != null">
+        TAXLINECOST = #{taxlinecost,jdbcType=NUMERIC},
+      </if>
+      <if test="receivedqty != null">
+        RECEIVEDQTY = #{receivedqty,jdbcType=NUMERIC},
+      </if>
+      <if test="receivedunitcost != null">
+        RECEIVEDUNITCOST = #{receivedunitcost,jdbcType=NUMERIC},
+      </if>
+      <if test="receivedtotalcost != null">
+        RECEIVEDTOTALCOST = #{receivedtotalcost,jdbcType=NUMERIC},
+      </if>
+      <if test="taxcode != null">
+        TAXCODE = #{taxcode,jdbcType=NVARCHAR},
+      </if>
+      <if test="taxrate != null">
+        TAXRATE = #{taxrate,jdbcType=NUMERIC},
+      </if>
+      <if test="tax != null">
+        TAX = #{tax,jdbcType=NUMERIC},
+      </if>
+      <if test="rejectedqty != null">
+        REJECTEDQTY = #{rejectedqty,jdbcType=NUMERIC},
+      </if>
+      <if test="vendeliverydate != null">
+        VENDELIVERYDATE = #{vendeliverydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="enterdate != null">
+        ENTERDATE = #{enterdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="enterby != null">
+        ENTERBY = #{enterby,jdbcType=NVARCHAR},
+      </if>
+      <if test="requestedby != null">
+        REQUESTEDBY = #{requestedby,jdbcType=NVARCHAR},
+      </if>
+      <if test="reqdeliverydate != null">
+        REQDELIVERYDATE = #{reqdeliverydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="manufacturer != null">
+        MANUFACTURER = #{manufacturer,jdbcType=NVARCHAR},
+      </if>
+      <if test="modelnum != null">
+        MODELNUM = #{modelnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="service != null">
+        SERVICE = #{service,jdbcType=NVARCHAR},
+      </if>
+      <if test="stocktype != null">
+        STOCKTYPE = #{stocktype,jdbcType=NVARCHAR},
+      </if>
+      <if test="remark != null">
+        REMARK = #{remark,jdbcType=NVARCHAR},
+      </if>
+      <if test="location != null">
+        LOCATION = #{location,jdbcType=NVARCHAR},
+      </if>
+      <if test="receiptscomplete != null">
+        RECEIPTSCOMPLETE = #{receiptscomplete,jdbcType=NVARCHAR},
+      </if>
+      <if test="inspection != null">
+        INSPECTION = #{inspection,jdbcType=NVARCHAR},
+      </if>
+      <if test="loadedcost != null">
+        LOADEDCOST = #{loadedcost,jdbcType=NUMERIC},
+      </if>
+      <if test="prorated != null">
+        PRORATED = #{prorated,jdbcType=NVARCHAR},
+      </if>
+      <if test="proratecost != null">
+        PRORATECOST = #{proratecost,jdbcType=NUMERIC},
+      </if>
+      <if test="wonum != null">
+        WONUM = #{wonum,jdbcType=NVARCHAR},
+      </if>
+      <if test="tasknum != null">
+        TASKNUM = #{tasknum,jdbcType=NVARCHAR},
+      </if>
+      <if test="budnum != null">
+        BUDNUM = #{budnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="buditem != null">
+        BUDITEM = #{buditem,jdbcType=NVARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Poline">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update POLINE
+    set PONUM = #{ponum,jdbcType=NVARCHAR},
+      POLINENUM = #{polinenum,jdbcType=NUMERIC},
+      ITEMNUM = #{itemnum,jdbcType=NVARCHAR},
+      DESCRIPTION = #{description,jdbcType=NVARCHAR},
+      WAREHOUSE = #{warehouse,jdbcType=NVARCHAR},
+      ORDERQTY = #{orderqty,jdbcType=NUMERIC},
+      ORDERUNIT = #{orderunit,jdbcType=NVARCHAR},
+      CONVERSION = #{conversion,jdbcType=NUMERIC},
+      UNITCOST = #{unitcost,jdbcType=NUMERIC},
+      TAXUNITCOST = #{taxunitcost,jdbcType=NUMERIC},
+      LINECOST = #{linecost,jdbcType=NUMERIC},
+      TAXLINECOST = #{taxlinecost,jdbcType=NUMERIC},
+      RECEIVEDQTY = #{receivedqty,jdbcType=NUMERIC},
+      RECEIVEDUNITCOST = #{receivedunitcost,jdbcType=NUMERIC},
+      RECEIVEDTOTALCOST = #{receivedtotalcost,jdbcType=NUMERIC},
+      TAXCODE = #{taxcode,jdbcType=NVARCHAR},
+      TAXRATE = #{taxrate,jdbcType=NUMERIC},
+      TAX = #{tax,jdbcType=NUMERIC},
+      REJECTEDQTY = #{rejectedqty,jdbcType=NUMERIC},
+      VENDELIVERYDATE = #{vendeliverydate,jdbcType=TIMESTAMP},
+      ENTERDATE = #{enterdate,jdbcType=TIMESTAMP},
+      ENTERBY = #{enterby,jdbcType=NVARCHAR},
+      REQUESTEDBY = #{requestedby,jdbcType=NVARCHAR},
+      REQDELIVERYDATE = #{reqdeliverydate,jdbcType=TIMESTAMP},
+      MANUFACTURER = #{manufacturer,jdbcType=NVARCHAR},
+      MODELNUM = #{modelnum,jdbcType=NVARCHAR},
+      SERVICE = #{service,jdbcType=NVARCHAR},
+      STOCKTYPE = #{stocktype,jdbcType=NVARCHAR},
+      REMARK = #{remark,jdbcType=NVARCHAR},
+      LOCATION = #{location,jdbcType=NVARCHAR},
+      RECEIPTSCOMPLETE = #{receiptscomplete,jdbcType=NVARCHAR},
+      INSPECTION = #{inspection,jdbcType=NVARCHAR},
+      LOADEDCOST = #{loadedcost,jdbcType=NUMERIC},
+      PRORATED = #{prorated,jdbcType=NVARCHAR},
+      PRORATECOST = #{proratecost,jdbcType=NUMERIC},
+      WONUM = #{wonum,jdbcType=NVARCHAR},
+      TASKNUM = #{tasknum,jdbcType=NVARCHAR},
+      BUDNUM = #{budnum,jdbcType=NVARCHAR},
+      BUDITEM = #{buditem,jdbcType=NVARCHAR}
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+
+    <select id="selectPolineList" resultType="com.gyee.frame.model.custom.PolineVo">
+        SELECT
+        p.ponum,
+        p.status,
+        p.statusdate,
+        p.vendor,
+        p.totalcost,
+        p.totaltax,
+        p.sitenum,
+        p.description,
+        l.itemnum,
+        l.warehouse,
+        l.orderqty,
+        l.orderunit,
+        l.unitcost,
+        l.linecost,
+        l.enterdate,
+        l.enterby,
+        i.modelnum
+        FROM
+        POLINE l
+        LEFT JOIN Po p ON p.ponum = l.ponum
+        LEFT JOIN ITEM i on i.itemnum = l.itemnum
+        <where>
+
+            <if test=" '' != vendor and null != vendor ">
+                and p.vendor like '%${vendor}%'
+            </if>
+            <if test=" '' != warehouse and null != warehouse ">
+                and l.warehouse like '%${warehouse}%'
+            </if>
+            <if test=" '' != ponum and null != ponum ">
+                and p.ponum like '%${ponum}%'
+            </if>
+
+            <if test=" '' != starttime and starttime !=null and endtime !=null  and '' != endtime">
+                and  l.enterdate &gt;= #{starttime} and l.enterdate &lt;= #{endtime}
+            </if>
+        </where>
+
+    </select>
+
+</mapper>