几个数据来源的表 新增字段

slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiDailyController.java

@@ -0,0 +1,105 @@
+package com.slibra.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.slibra.business.domain.TXinyiDaily;
+import com.slibra.business.service.ITXinyiDailyService;
+import com.slibra.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.slibra.common.annotation.Log;
+import com.slibra.common.core.controller.BaseController;
+import com.slibra.common.core.domain.AjaxResult;
+import com.slibra.common.enums.BusinessType;
+import com.slibra.common.core.page.TableDataInfo;
+
+/**
+ * 信义日报数据Controller
+ * 
+ * @author slibra
+ * @date 2024-04-13
+ */
+@RestController
+@RequestMapping("/system/daily")
+public class TXinyiDailyController extends BaseController
+{
+    @Autowired
+    private ITXinyiDailyService tXinyiDailyService;
+
+    /**
+     * 查询信义日报数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:daily:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TXinyiDaily tXinyiDaily)
+    {
+        startPage();
+        List<TXinyiDaily> list = tXinyiDailyService.selectTXinyiDailyList(tXinyiDaily);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出信义日报数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:daily:export')")
+    @Log(title = "信义日报数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TXinyiDaily tXinyiDaily)
+    {
+        List<TXinyiDaily> list = tXinyiDailyService.selectTXinyiDailyList(tXinyiDaily);
+        ExcelUtil<TXinyiDaily> util = new ExcelUtil<TXinyiDaily>(TXinyiDaily.class);
+        util.exportExcel(response, list, "信义日报数据数据");
+    }
+
+    /**
+     * 获取信义日报数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:daily:query')")
+    @GetMapping(value = "/{ID}")
+    public AjaxResult getInfo(@PathVariable("ID") Long ID)
+    {
+        return success(tXinyiDailyService.selectTXinyiDailyByID(ID));
+    }
+
+    /**
+     * 新增信义日报数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:daily:add')")
+    @Log(title = "信义日报数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TXinyiDaily tXinyiDaily)
+    {
+        return toAjax(tXinyiDailyService.insertTXinyiDaily(tXinyiDaily));
+    }
+
+    /**
+     * 修改信义日报数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:daily:edit')")
+    @Log(title = "信义日报数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TXinyiDaily tXinyiDaily)
+    {
+        return toAjax(tXinyiDailyService.updateTXinyiDaily(tXinyiDaily));
+    }
+
+    /**
+     * 删除信义日报数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:daily:remove')")
+    @Log(title = "信义日报数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{IDs}")
+    public AjaxResult remove(@PathVariable Long[] IDs)
+    {
+        return toAjax(tXinyiDailyService.deleteTXinyiDailyByIDs(IDs));
+    }
+}

slibra-system/src/main/java/com/slibra/business/domain/TXinyiDaily.java

@@ -0,0 +1,243 @@
+package com.slibra.business.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.slibra.common.annotation.Excel;
+import com.slibra.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 信义日报数据对象 t_xinyi_daily
+ * 
+ * @author slibra
+ * @date 2024-04-13
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TXinyiDaily extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long ID;
+
+    /** 化验日期 */
+    @Excel(name = "化验日期")
+    private String testDate;
+
+    /** 化验日期-小时 */
+    @Excel(name = "化验日期-小时")
+    private String testHour;
+
+    /** 化验时间（2023/12/13 5:00:00格式的） */
+    @Excel(name = "化验时间", readConverterExp = "2=023/12/13,5=:00:00格式的")
+    private String testTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long SORT;
+
+    /** 进水化学需氧量 COD */
+    @Excel(name = "进水化学需氧量 COD")
+    private BigDecimal jsCod;
+
+    /** 进水酸碱度pH */
+    @Excel(name = "进水酸碱度pH")
+    private BigDecimal jsPh;
+
+    /** 进水生化需氧量BOD₅ */
+    @Excel(name = "进水生化需氧量BOD₅")
+    private BigDecimal jsBod5;
+
+    /** 进水悬浮物 SS */
+    @Excel(name = "进水悬浮物 SS")
+    private BigDecimal jsSs;
+
+    /** 进水氨氮 NH₃-N */
+    @Excel(name = "进水氨氮 NH₃-N")
+    private BigDecimal jsNh3;
+
+    /** 进水总氮TN */
+    @Excel(name = "进水总氮TN")
+    private BigDecimal jsTn;
+
+    /** 进水总磷TP */
+    @Excel(name = "进水总磷TP")
+    private BigDecimal jsTp;
+
+    /** 进水粪菌群（大肠杆菌） */
+    @Excel(name = "进水粪菌群", readConverterExp = "大=肠杆菌")
+    private BigDecimal jsDcgj;
+
+    /** 出水化学需氧量COD */
+    @Excel(name = "出水化学需氧量COD")
+    private BigDecimal csCod;
+
+    /** 出水酸碱度pH */
+    @Excel(name = "出水酸碱度pH")
+    private BigDecimal csPh;
+
+    /** 出水生化需氧量BOD₅ */
+    @Excel(name = "出水生化需氧量BOD₅")
+    private BigDecimal csBod5;
+
+    /** 出水悬浮物SS */
+    @Excel(name = "出水悬浮物SS")
+    private BigDecimal csSs;
+
+    /** 出水氨氮 NH₃-N */
+    @Excel(name = "出水氨氮 NH₃-N")
+    private BigDecimal csNh3;
+
+    /** 出水总氮TN */
+    @Excel(name = "出水总氮TN")
+    private BigDecimal csTn;
+
+    /** 出水总磷TP */
+    @Excel(name = "出水总磷TP")
+    private BigDecimal csTp;
+
+    /** 出水粪菌群（大肠杆菌） */
+    @Excel(name = "出水粪菌群", readConverterExp = "大=肠杆菌")
+    private BigDecimal csDcgj;
+
+    /** 进水水温 */
+    @Excel(name = "进水水温")
+    private BigDecimal jsSw;
+
+    /** 出水水温 */
+    @Excel(name = "出水水温")
+    private BigDecimal csSw;
+
+    /** 生化池好氧池#1 酸碱度pH */
+    @Excel(name = "生化池好氧池#1 酸碱度pH")
+    private BigDecimal shcOnePh;
+
+    /** 生化池好氧池#2 酸碱度pH */
+    @Excel(name = "生化池好氧池#2 酸碱度pH")
+    private BigDecimal shcTwoPh;
+
+    /** 生化池好氧池#1 污泥沉降比SV% */
+    @Excel(name = "生化池好氧池#1 污泥沉降比SV%")
+    private BigDecimal shcHyOneSv;
+
+    /** 生化池好氧池#2 污泥沉降比SV% */
+    @Excel(name = "生化池好氧池#2 污泥沉降比SV%")
+    private BigDecimal shcHyTwoSv;
+
+    /** 生化池好氧池#1 污泥体积指数SVI */
+    @Excel(name = "生化池好氧池#1 污泥体积指数SVI")
+    private BigDecimal shcHyOneSvi;
+
+    /** 生化池好氧池#2 污泥体积指数SVI */
+    @Excel(name = "生化池好氧池#2 污泥体积指数SVI")
+    private BigDecimal shcHyTwoSvi;
+
+    /** 生化池好氧池#1 污泥浓度MLSS */
+    @Excel(name = "生化池好氧池#1 污泥浓度MLSS")
+    private BigDecimal shcHyOneMlss;
+
+    /** 生化池好氧池#2 污泥浓度MLSS */
+    @Excel(name = "生化池好氧池#2 污泥浓度MLSS")
+    private BigDecimal shcHyTwoMlss;
+
+    /** 生化池好氧池#1 挥发性污泥浓度MLVSS */
+    @Excel(name = "生化池好氧池#1 挥发性污泥浓度MLVSS")
+    private BigDecimal shcHyOneMlvss;
+
+    /** 生化池好氧池#2 挥发性污泥浓度MLVSS */
+    @Excel(name = "生化池好氧池#2 挥发性污泥浓度MLVSS")
+    private BigDecimal shcHyTwoMlvss;
+
+    /** 生化池厌氧池#1 溶解氧DO */
+    @Excel(name = "生化池厌氧池#1 溶解氧DO")
+    private BigDecimal shcYyOneDo;
+
+    /** 生化池厌氧池#2 溶解氧DO */
+    @Excel(name = "生化池厌氧池#2 溶解氧DO")
+    private BigDecimal shcYyTwoDo;
+
+    /** 生化池缺氧池#1 溶解氧DO */
+    @Excel(name = "生化池缺氧池#1 溶解氧DO")
+    private BigDecimal shcQyOneDo;
+
+    /** 生化池缺氧池#2 溶解氧DO */
+    @Excel(name = "生化池缺氧池#2 溶解氧DO")
+    private BigDecimal shcQyTwoDo;
+
+    /** 生化池好氧池#1 溶解氧DO */
+    @Excel(name = "生化池好氧池#1 溶解氧DO")
+    private BigDecimal shcHyOneDo;
+
+    /** 生化池好氧池#2 溶解氧DO */
+    @Excel(name = "生化池好氧池#2 溶解氧DO")
+    private BigDecimal shcHyTwoDo;
+
+    /** 进水量 */
+    @Excel(name = "进水量")
+    private BigDecimal JSL;
+
+    /** 出水量 */
+    @Excel(name = "出水量")
+    private BigDecimal CSL;
+
+    /** 深度处理冲洗水量(m³) */
+    @Excel(name = "深度处理冲洗水量(m³)")
+    private BigDecimal SDCLCXSL;
+
+    /** 气水比 */
+    @Excel(name = "气水比")
+    private BigDecimal QSB;
+
+    /** F/M（污泥负荷） */
+    @Excel(name = "F/M", readConverterExp = "污=泥负荷")
+    private BigDecimal fM;
+
+    /** 厌氧区停留时间 HRT */
+    @Excel(name = "厌氧区停留时间 HRT")
+    private BigDecimal yyHrt;
+
+    /** 好氧区停留时间HRT */
+    @Excel(name = "好氧区停留时间HRT")
+    private BigDecimal hyHrt;
+
+    /** 缺氧区停留时间 HRT */
+    @Excel(name = "缺氧区停留时间 HRT")
+    private BigDecimal qyHrt;
+
+    /** 内回流r */
+    @Excel(name = "内回流r")
+    private BigDecimal nhlR;
+
+    /** 外回流R */
+    @Excel(name = "外回流R")
+    private BigDecimal whlR;
+
+    /** 污泥龄SRT */
+    @Excel(name = "污泥龄SRT")
+    private BigDecimal SRT;
+
+    /** 产泥率 */
+    @Excel(name = "产泥率")
+    private BigDecimal CNL;
+
+    /** 投药前 BOD₅/TN */
+    @Excel(name = "投药前 BOD₅/TN")
+    private BigDecimal tyqBod5Tn;
+
+    /** 投药后 BOD₅/TN */
+    @Excel(name = "投药后 BOD₅/TN")
+    private BigDecimal tyhBod5Tn;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+}

slibra-system/src/main/java/com/slibra/business/domain/TXinyiIndustry.java

@@ -21,6 +21,13 @@ public class TXinyiIndustry
     /** 主键 */
     private Long ID;
 
+    /** 化验日期 精确到日期*/
+    private String testDate;
+
+    /** 化验时间 精确到小时*/
+    private String testHour;
+
+
     /** 化验时间（2023/12/13 5:00:00格式的） */
     @Excel(name = "化验时间", readConverterExp = "2=023/12/13,5=:00:00格式的")
     private String testTime;

slibra-system/src/main/java/com/slibra/business/domain/TXinyiLaboratory.java

@@ -3,6 +3,10 @@ package com.slibra.business.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.slibra.common.annotation.Excel;
@@ -14,6 +18,10 @@ import com.slibra.common.core.domain.BaseEntity;
  * @author slibra
  * @date 2024-03-27
  */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class TXinyiLaboratory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -21,6 +29,14 @@ public class TXinyiLaboratory extends BaseEntity
     /** 主键 */
     private Long ID;
 
+    /** 化验日期 */
+    @Excel(name = "化验日期")
+    private String testDate;
+
+    /** 化验日期-小时 */
+    @Excel(name = "化验日期-小时")
+    private String testHour;
+
     /** 化验时间（2023/12/13 5:00:00格式的） */
     @Excel(name = "化验时间", readConverterExp = "2=023/12/13,5=:00:00格式的")
     private String testTime;
@@ -66,130 +82,4 @@ public class TXinyiLaboratory extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
-    public void setID(Long ID) 
-    {
-        this.ID = ID;
-    }
-
-    public Long getID() 
-    {
-        return ID;
-    }
-    public void setTestTime(String testTime) 
-    {
-        this.testTime = testTime;
-    }
-
-    public String getTestTime() 
-    {
-        return testTime;
-    }
-    public void setOneHycxsy(BigDecimal oneHycxsy) 
-    {
-        this.oneHycxsy = oneHycxsy;
-    }
-
-    public BigDecimal getOneHycxsy() 
-    {
-        return oneHycxsy;
-    }
-    public void setTwoHycxsy(BigDecimal twoHycxsy) 
-    {
-        this.twoHycxsy = twoHycxsy;
-    }
-
-    public BigDecimal getTwoHycxsy() 
-    {
-        return twoHycxsy;
-    }
-    public void setOneQyckxsy(BigDecimal oneQyckxsy) 
-    {
-        this.oneQyckxsy = oneQyckxsy;
-    }
-
-    public BigDecimal getOneQyckxsy() 
-    {
-        return oneQyckxsy;
-    }
-    public void setTwoQyckxsy(BigDecimal twoQyckxsy) 
-    {
-        this.twoQyckxsy = twoQyckxsy;
-    }
-
-    public BigDecimal getTwoQyckxsy() 
-    {
-        return twoQyckxsy;
-    }
-    public void setZL(BigDecimal ZL) 
-    {
-        this.ZL = ZL;
-    }
-
-    public BigDecimal getZL() 
-    {
-        return ZL;
-    }
-    public void setOneHyZlsy(BigDecimal oneHyZlsy) 
-    {
-        this.oneHyZlsy = oneHyZlsy;
-    }
-
-    public BigDecimal getOneHyZlsy() 
-    {
-        return oneHyZlsy;
-    }
-    public void setTwoHyZlsy(BigDecimal twoHyZlsy) 
-    {
-        this.twoHyZlsy = twoHyZlsy;
-    }
-
-    public BigDecimal getTwoHyZlsy() 
-    {
-        return twoHyZlsy;
-    }
-    public void setOneQyad(BigDecimal oneQyad) 
-    {
-        this.oneQyad = oneQyad;
-    }
-
-    public BigDecimal getOneQyad() 
-    {
-        return oneQyad;
-    }
-    public void setTwoQyad(BigDecimal twoQyad) 
-    {
-        this.twoQyad = twoQyad;
-    }
-
-    public BigDecimal getTwoQyad() 
-    {
-        return twoQyad;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("ID", getID())
-            .append("testTime", getTestTime())
-            .append("oneHycxsy", getOneHycxsy())
-            .append("twoHycxsy", getTwoHycxsy())
-            .append("oneQyckxsy", getOneQyckxsy())
-            .append("twoQyckxsy", getTwoQyckxsy())
-            .append("ZL", getZL())
-            .append("oneHyZlsy", getOneHyZlsy())
-            .append("twoHyZlsy", getTwoHyZlsy())
-            .append("oneQyad", getOneQyad())
-            .append("twoQyad", getTwoQyad())
-            .append("createdTime", getCreatedTime())
-            .toString();
-    }
 }

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiDailyMapper.java

@@ -0,0 +1,62 @@
+package com.slibra.business.mapper;
+
+import com.slibra.business.domain.TXinyiDaily;
+
+import java.util.List;
+
+/**
+ * 信义日报数据Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-04-13
+ */
+public interface TXinyiDailyMapper 
+{
+    /**
+     * 查询信义日报数据
+     * 
+     * @param ID 信义日报数据主键
+     * @return 信义日报数据
+     */
+    public TXinyiDaily selectTXinyiDailyByID(Long ID);
+
+    /**
+     * 查询信义日报数据列表
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 信义日报数据集合
+     */
+    public List<TXinyiDaily> selectTXinyiDailyList(TXinyiDaily tXinyiDaily);
+
+    /**
+     * 新增信义日报数据
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 结果
+     */
+    public int insertTXinyiDaily(TXinyiDaily tXinyiDaily);
+
+    /**
+     * 修改信义日报数据
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 结果
+     */
+    public int updateTXinyiDaily(TXinyiDaily tXinyiDaily);
+
+    /**
+     * 删除信义日报数据
+     * 
+     * @param ID 信义日报数据主键
+     * @return 结果
+     */
+    public int deleteTXinyiDailyByID(Long ID);
+
+    /**
+     * 批量删除信义日报数据
+     * 
+     * @param IDs 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTXinyiDailyByIDs(Long[] IDs);
+}

slibra-system/src/main/java/com/slibra/business/service/ITXinyiDailyService.java

@@ -0,0 +1,62 @@
+package com.slibra.business.service;
+
+import com.slibra.business.domain.TXinyiDaily;
+
+import java.util.List;
+
+/**
+ * 信义日报数据Service接口
+ * 
+ * @author slibra
+ * @date 2024-04-13
+ */
+public interface ITXinyiDailyService 
+{
+    /**
+     * 查询信义日报数据
+     * 
+     * @param ID 信义日报数据主键
+     * @return 信义日报数据
+     */
+    public TXinyiDaily selectTXinyiDailyByID(Long ID);
+
+    /**
+     * 查询信义日报数据列表
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 信义日报数据集合
+     */
+    public List<TXinyiDaily> selectTXinyiDailyList(TXinyiDaily tXinyiDaily);
+
+    /**
+     * 新增信义日报数据
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 结果
+     */
+    public int insertTXinyiDaily(TXinyiDaily tXinyiDaily);
+
+    /**
+     * 修改信义日报数据
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 结果
+     */
+    public int updateTXinyiDaily(TXinyiDaily tXinyiDaily);
+
+    /**
+     * 批量删除信义日报数据
+     * 
+     * @param IDs 需要删除的信义日报数据主键集合
+     * @return 结果
+     */
+    public int deleteTXinyiDailyByIDs(Long[] IDs);
+
+    /**
+     * 删除信义日报数据信息
+     * 
+     * @param ID 信义日报数据主键
+     * @return 结果
+     */
+    public int deleteTXinyiDailyByID(Long ID);
+}

slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiDailyServiceImpl.java

@@ -0,0 +1,94 @@
+package com.slibra.business.service.impl;
+
+import java.util.List;
+
+import com.slibra.business.domain.TXinyiDaily;
+import com.slibra.business.mapper.TXinyiDailyMapper;
+import com.slibra.business.service.ITXinyiDailyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 信义日报数据Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-04-13
+ */
+@Service
+public class TXinyiDailyServiceImpl implements ITXinyiDailyService
+{
+    @Autowired
+    private TXinyiDailyMapper tXinyiDailyMapper;
+
+    /**
+     * 查询信义日报数据
+     * 
+     * @param ID 信义日报数据主键
+     * @return 信义日报数据
+     */
+    @Override
+    public TXinyiDaily selectTXinyiDailyByID(Long ID)
+    {
+        return tXinyiDailyMapper.selectTXinyiDailyByID(ID);
+    }
+
+    /**
+     * 查询信义日报数据列表
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 信义日报数据
+     */
+    @Override
+    public List<TXinyiDaily> selectTXinyiDailyList(TXinyiDaily tXinyiDaily)
+    {
+        return tXinyiDailyMapper.selectTXinyiDailyList(tXinyiDaily);
+    }
+
+    /**
+     * 新增信义日报数据
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 结果
+     */
+    @Override
+    public int insertTXinyiDaily(TXinyiDaily tXinyiDaily)
+    {
+        return tXinyiDailyMapper.insertTXinyiDaily(tXinyiDaily);
+    }
+
+    /**
+     * 修改信义日报数据
+     * 
+     * @param tXinyiDaily 信义日报数据
+     * @return 结果
+     */
+    @Override
+    public int updateTXinyiDaily(TXinyiDaily tXinyiDaily)
+    {
+        return tXinyiDailyMapper.updateTXinyiDaily(tXinyiDaily);
+    }
+
+    /**
+     * 批量删除信义日报数据
+     * 
+     * @param IDs 需要删除的信义日报数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTXinyiDailyByIDs(Long[] IDs)
+    {
+        return tXinyiDailyMapper.deleteTXinyiDailyByIDs(IDs);
+    }
+
+    /**
+     * 删除信义日报数据信息
+     * 
+     * @param ID 信义日报数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTXinyiDailyByID(Long ID)
+    {
+        return tXinyiDailyMapper.deleteTXinyiDailyByID(ID);
+    }
+}

slibra-system/src/main/resources/mapper/business/TXinyiDailyMapper.xml

@@ -0,0 +1,316 @@
+<?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.slibra.business.mapper.TXinyiDailyMapper">
+    
+    <resultMap type="TXinyiDaily" id="TXinyiDailyResult">
+        <result property="ID"    column="ID"    />
+        <result property="testDate"    column="TEST_DATE"    />
+        <result property="testHour"    column="TEST_HOUR"    />
+        <result property="testTime"    column="TEST_TIME"    />
+        <result property="SORT"    column="SORT"    />
+        <result property="jsCod"    column="JS_COD"    />
+        <result property="jsPh"    column="JS_PH"    />
+        <result property="jsBod5"    column="JS_BOD5"    />
+        <result property="jsSs"    column="JS_SS"    />
+        <result property="jsNh3"    column="JS_NH3"    />
+        <result property="jsTn"    column="JS_TN"    />
+        <result property="jsTp"    column="JS_TP"    />
+        <result property="jsDcgj"    column="JS_DCGJ"    />
+        <result property="csCod"    column="CS_COD"    />
+        <result property="csPh"    column="CS_PH"    />
+        <result property="csBod5"    column="CS_BOD5"    />
+        <result property="csSs"    column="CS_SS"    />
+        <result property="csNh3"    column="CS_NH3"    />
+        <result property="csTn"    column="CS_TN"    />
+        <result property="csTp"    column="CS_TP"    />
+        <result property="csDcgj"    column="CS_DCGJ"    />
+        <result property="jsSw"    column="JS_SW"    />
+        <result property="csSw"    column="CS_SW"    />
+        <result property="shcOnePh"    column="SHC_ONE_PH"    />
+        <result property="shcTwoPh"    column="SHC_TWO_PH"    />
+        <result property="shcHyOneSv"    column="SHC_HY_ONE_SV"    />
+        <result property="shcHyTwoSv"    column="SHC_HY_TWO_SV"    />
+        <result property="shcHyOneSvi"    column="SHC_HY_ONE_SVI"    />
+        <result property="shcHyTwoSvi"    column="SHC_HY_TWO_SVI"    />
+        <result property="shcHyOneMlss"    column="SHC_HY_ONE_MLSS"    />
+        <result property="shcHyTwoMlss"    column="SHC_HY_TWO_MLSS"    />
+        <result property="shcHyOneMlvss"    column="SHC_HY_ONE_MLVSS"    />
+        <result property="shcHyTwoMlvss"    column="SHC_HY_TWO_MLVSS"    />
+        <result property="shcYyOneDo"    column="SHC_YY_ONE_DO"    />
+        <result property="shcYyTwoDo"    column="SHC_YY_TWO_DO"    />
+        <result property="shcQyOneDo"    column="SHC_QY_ONE_DO"    />
+        <result property="shcQyTwoDo"    column="SHC_QY_TWO_DO"    />
+        <result property="shcHyOneDo"    column="SHC_HY_ONE_DO"    />
+        <result property="shcHyTwoDo"    column="SHC_HY_TWO_DO"    />
+        <result property="JSL"    column="JSL"    />
+        <result property="CSL"    column="CSL"    />
+        <result property="SDCLCXSL"    column="SDCLCXSL"    />
+        <result property="QSB"    column="QSB"    />
+        <result property="fM"    column="F_M"    />
+        <result property="yyHrt"    column="YY_HRT"    />
+        <result property="hyHrt"    column="HY_HRT"    />
+        <result property="qyHrt"    column="QY_HRT"    />
+        <result property="nhlR"    column="NHL_R"    />
+        <result property="whlR"    column="WHL_R"    />
+        <result property="SRT"    column="SRT"    />
+        <result property="CNL"    column="CNL"    />
+        <result property="tyqBod5Tn"    column="TYQ_BOD5_TN"    />
+        <result property="tyhBod5Tn"    column="TYH_BOD5_TN"    />
+        <result property="createdTime"    column="CREATED_TIME"    />
+    </resultMap>
+
+    <sql id="selectTXinyiDailyVo">
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, CREATED_TIME from t_xinyi_daily
+    </sql>
+
+    <select id="selectTXinyiDailyList" parameterType="TXinyiDaily" resultMap="TXinyiDailyResult">
+        <include refid="selectTXinyiDailyVo"/>
+        <where>  
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
+            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
+            <if test="SORT != null "> and SORT = #{SORT}</if>
+            <if test="jsCod != null "> and JS_COD = #{jsCod}</if>
+            <if test="jsPh != null "> and JS_PH = #{jsPh}</if>
+            <if test="jsBod5 != null "> and JS_BOD5 = #{jsBod5}</if>
+            <if test="jsSs != null "> and JS_SS = #{jsSs}</if>
+            <if test="jsNh3 != null "> and JS_NH3 = #{jsNh3}</if>
+            <if test="jsTn != null "> and JS_TN = #{jsTn}</if>
+            <if test="jsTp != null "> and JS_TP = #{jsTp}</if>
+            <if test="jsDcgj != null "> and JS_DCGJ = #{jsDcgj}</if>
+            <if test="csCod != null "> and CS_COD = #{csCod}</if>
+            <if test="csPh != null "> and CS_PH = #{csPh}</if>
+            <if test="csBod5 != null "> and CS_BOD5 = #{csBod5}</if>
+            <if test="csSs != null "> and CS_SS = #{csSs}</if>
+            <if test="csNh3 != null "> and CS_NH3 = #{csNh3}</if>
+            <if test="csTn != null "> and CS_TN = #{csTn}</if>
+            <if test="csTp != null "> and CS_TP = #{csTp}</if>
+            <if test="csDcgj != null "> and CS_DCGJ = #{csDcgj}</if>
+            <if test="jsSw != null "> and JS_SW = #{jsSw}</if>
+            <if test="csSw != null "> and CS_SW = #{csSw}</if>
+            <if test="shcOnePh != null "> and SHC_ONE_PH = #{shcOnePh}</if>
+            <if test="shcTwoPh != null "> and SHC_TWO_PH = #{shcTwoPh}</if>
+            <if test="shcHyOneSv != null "> and SHC_HY_ONE_SV = #{shcHyOneSv}</if>
+            <if test="shcHyTwoSv != null "> and SHC_HY_TWO_SV = #{shcHyTwoSv}</if>
+            <if test="shcHyOneSvi != null "> and SHC_HY_ONE_SVI = #{shcHyOneSvi}</if>
+            <if test="shcHyTwoSvi != null "> and SHC_HY_TWO_SVI = #{shcHyTwoSvi}</if>
+            <if test="shcHyOneMlss != null "> and SHC_HY_ONE_MLSS = #{shcHyOneMlss}</if>
+            <if test="shcHyTwoMlss != null "> and SHC_HY_TWO_MLSS = #{shcHyTwoMlss}</if>
+            <if test="shcHyOneMlvss != null "> and SHC_HY_ONE_MLVSS = #{shcHyOneMlvss}</if>
+            <if test="shcHyTwoMlvss != null "> and SHC_HY_TWO_MLVSS = #{shcHyTwoMlvss}</if>
+            <if test="shcYyOneDo != null "> and SHC_YY_ONE_DO = #{shcYyOneDo}</if>
+            <if test="shcYyTwoDo != null "> and SHC_YY_TWO_DO = #{shcYyTwoDo}</if>
+            <if test="shcQyOneDo != null "> and SHC_QY_ONE_DO = #{shcQyOneDo}</if>
+            <if test="shcQyTwoDo != null "> and SHC_QY_TWO_DO = #{shcQyTwoDo}</if>
+            <if test="shcHyOneDo != null "> and SHC_HY_ONE_DO = #{shcHyOneDo}</if>
+            <if test="shcHyTwoDo != null "> and SHC_HY_TWO_DO = #{shcHyTwoDo}</if>
+            <if test="JSL != null "> and JSL = #{JSL}</if>
+            <if test="CSL != null "> and CSL = #{CSL}</if>
+            <if test="SDCLCXSL != null "> and SDCLCXSL = #{SDCLCXSL}</if>
+            <if test="QSB != null "> and QSB = #{QSB}</if>
+            <if test="fM != null "> and F_M = #{fM}</if>
+            <if test="yyHrt != null "> and YY_HRT = #{yyHrt}</if>
+            <if test="hyHrt != null "> and HY_HRT = #{hyHrt}</if>
+            <if test="qyHrt != null "> and QY_HRT = #{qyHrt}</if>
+            <if test="nhlR != null "> and NHL_R = #{nhlR}</if>
+            <if test="whlR != null "> and WHL_R = #{whlR}</if>
+            <if test="SRT != null "> and SRT = #{SRT}</if>
+            <if test="CNL != null "> and CNL = #{CNL}</if>
+            <if test="tyqBod5Tn != null "> and TYQ_BOD5_TN = #{tyqBod5Tn}</if>
+            <if test="tyhBod5Tn != null "> and TYH_BOD5_TN = #{tyhBod5Tn}</if>
+            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTXinyiDailyByID" parameterType="Long" resultMap="TXinyiDailyResult">
+        <include refid="selectTXinyiDailyVo"/>
+        where ID = #{ID}
+    </select>
+        
+    <insert id="insertTXinyiDaily" parameterType="TXinyiDaily" useGeneratedKeys="true" keyProperty="ID">
+        insert into t_xinyi_daily
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="testDate != null">TEST_DATE,</if>
+            <if test="testHour != null">TEST_HOUR,</if>
+            <if test="testTime != null">TEST_TIME,</if>
+            <if test="SORT != null">SORT,</if>
+            <if test="jsCod != null">JS_COD,</if>
+            <if test="jsPh != null">JS_PH,</if>
+            <if test="jsBod5 != null">JS_BOD5,</if>
+            <if test="jsSs != null">JS_SS,</if>
+            <if test="jsNh3 != null">JS_NH3,</if>
+            <if test="jsTn != null">JS_TN,</if>
+            <if test="jsTp != null">JS_TP,</if>
+            <if test="jsDcgj != null">JS_DCGJ,</if>
+            <if test="csCod != null">CS_COD,</if>
+            <if test="csPh != null">CS_PH,</if>
+            <if test="csBod5 != null">CS_BOD5,</if>
+            <if test="csSs != null">CS_SS,</if>
+            <if test="csNh3 != null">CS_NH3,</if>
+            <if test="csTn != null">CS_TN,</if>
+            <if test="csTp != null">CS_TP,</if>
+            <if test="csDcgj != null">CS_DCGJ,</if>
+            <if test="jsSw != null">JS_SW,</if>
+            <if test="csSw != null">CS_SW,</if>
+            <if test="shcOnePh != null">SHC_ONE_PH,</if>
+            <if test="shcTwoPh != null">SHC_TWO_PH,</if>
+            <if test="shcHyOneSv != null">SHC_HY_ONE_SV,</if>
+            <if test="shcHyTwoSv != null">SHC_HY_TWO_SV,</if>
+            <if test="shcHyOneSvi != null">SHC_HY_ONE_SVI,</if>
+            <if test="shcHyTwoSvi != null">SHC_HY_TWO_SVI,</if>
+            <if test="shcHyOneMlss != null">SHC_HY_ONE_MLSS,</if>
+            <if test="shcHyTwoMlss != null">SHC_HY_TWO_MLSS,</if>
+            <if test="shcHyOneMlvss != null">SHC_HY_ONE_MLVSS,</if>
+            <if test="shcHyTwoMlvss != null">SHC_HY_TWO_MLVSS,</if>
+            <if test="shcYyOneDo != null">SHC_YY_ONE_DO,</if>
+            <if test="shcYyTwoDo != null">SHC_YY_TWO_DO,</if>
+            <if test="shcQyOneDo != null">SHC_QY_ONE_DO,</if>
+            <if test="shcQyTwoDo != null">SHC_QY_TWO_DO,</if>
+            <if test="shcHyOneDo != null">SHC_HY_ONE_DO,</if>
+            <if test="shcHyTwoDo != null">SHC_HY_TWO_DO,</if>
+            <if test="JSL != null">JSL,</if>
+            <if test="CSL != null">CSL,</if>
+            <if test="SDCLCXSL != null">SDCLCXSL,</if>
+            <if test="QSB != null">QSB,</if>
+            <if test="fM != null">F_M,</if>
+            <if test="yyHrt != null">YY_HRT,</if>
+            <if test="hyHrt != null">HY_HRT,</if>
+            <if test="qyHrt != null">QY_HRT,</if>
+            <if test="nhlR != null">NHL_R,</if>
+            <if test="whlR != null">WHL_R,</if>
+            <if test="SRT != null">SRT,</if>
+            <if test="CNL != null">CNL,</if>
+            <if test="tyqBod5Tn != null">TYQ_BOD5_TN,</if>
+            <if test="tyhBod5Tn != null">TYH_BOD5_TN,</if>
+            <if test="createdTime != null">CREATED_TIME,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="testDate != null">#{testDate},</if>
+            <if test="testHour != null">#{testHour},</if>
+            <if test="testTime != null">#{testTime},</if>
+            <if test="SORT != null">#{SORT},</if>
+            <if test="jsCod != null">#{jsCod},</if>
+            <if test="jsPh != null">#{jsPh},</if>
+            <if test="jsBod5 != null">#{jsBod5},</if>
+            <if test="jsSs != null">#{jsSs},</if>
+            <if test="jsNh3 != null">#{jsNh3},</if>
+            <if test="jsTn != null">#{jsTn},</if>
+            <if test="jsTp != null">#{jsTp},</if>
+            <if test="jsDcgj != null">#{jsDcgj},</if>
+            <if test="csCod != null">#{csCod},</if>
+            <if test="csPh != null">#{csPh},</if>
+            <if test="csBod5 != null">#{csBod5},</if>
+            <if test="csSs != null">#{csSs},</if>
+            <if test="csNh3 != null">#{csNh3},</if>
+            <if test="csTn != null">#{csTn},</if>
+            <if test="csTp != null">#{csTp},</if>
+            <if test="csDcgj != null">#{csDcgj},</if>
+            <if test="jsSw != null">#{jsSw},</if>
+            <if test="csSw != null">#{csSw},</if>
+            <if test="shcOnePh != null">#{shcOnePh},</if>
+            <if test="shcTwoPh != null">#{shcTwoPh},</if>
+            <if test="shcHyOneSv != null">#{shcHyOneSv},</if>
+            <if test="shcHyTwoSv != null">#{shcHyTwoSv},</if>
+            <if test="shcHyOneSvi != null">#{shcHyOneSvi},</if>
+            <if test="shcHyTwoSvi != null">#{shcHyTwoSvi},</if>
+            <if test="shcHyOneMlss != null">#{shcHyOneMlss},</if>
+            <if test="shcHyTwoMlss != null">#{shcHyTwoMlss},</if>
+            <if test="shcHyOneMlvss != null">#{shcHyOneMlvss},</if>
+            <if test="shcHyTwoMlvss != null">#{shcHyTwoMlvss},</if>
+            <if test="shcYyOneDo != null">#{shcYyOneDo},</if>
+            <if test="shcYyTwoDo != null">#{shcYyTwoDo},</if>
+            <if test="shcQyOneDo != null">#{shcQyOneDo},</if>
+            <if test="shcQyTwoDo != null">#{shcQyTwoDo},</if>
+            <if test="shcHyOneDo != null">#{shcHyOneDo},</if>
+            <if test="shcHyTwoDo != null">#{shcHyTwoDo},</if>
+            <if test="JSL != null">#{JSL},</if>
+            <if test="CSL != null">#{CSL},</if>
+            <if test="SDCLCXSL != null">#{SDCLCXSL},</if>
+            <if test="QSB != null">#{QSB},</if>
+            <if test="fM != null">#{fM},</if>
+            <if test="yyHrt != null">#{yyHrt},</if>
+            <if test="hyHrt != null">#{hyHrt},</if>
+            <if test="qyHrt != null">#{qyHrt},</if>
+            <if test="nhlR != null">#{nhlR},</if>
+            <if test="whlR != null">#{whlR},</if>
+            <if test="SRT != null">#{SRT},</if>
+            <if test="CNL != null">#{CNL},</if>
+            <if test="tyqBod5Tn != null">#{tyqBod5Tn},</if>
+            <if test="tyhBod5Tn != null">#{tyhBod5Tn},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTXinyiDaily" parameterType="TXinyiDaily">
+        update t_xinyi_daily
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="testDate != null">TEST_DATE = #{testDate},</if>
+            <if test="testHour != null">TEST_HOUR = #{testHour},</if>
+            <if test="testTime != null">TEST_TIME = #{testTime},</if>
+            <if test="SORT != null">SORT = #{SORT},</if>
+            <if test="jsCod != null">JS_COD = #{jsCod},</if>
+            <if test="jsPh != null">JS_PH = #{jsPh},</if>
+            <if test="jsBod5 != null">JS_BOD5 = #{jsBod5},</if>
+            <if test="jsSs != null">JS_SS = #{jsSs},</if>
+            <if test="jsNh3 != null">JS_NH3 = #{jsNh3},</if>
+            <if test="jsTn != null">JS_TN = #{jsTn},</if>
+            <if test="jsTp != null">JS_TP = #{jsTp},</if>
+            <if test="jsDcgj != null">JS_DCGJ = #{jsDcgj},</if>
+            <if test="csCod != null">CS_COD = #{csCod},</if>
+            <if test="csPh != null">CS_PH = #{csPh},</if>
+            <if test="csBod5 != null">CS_BOD5 = #{csBod5},</if>
+            <if test="csSs != null">CS_SS = #{csSs},</if>
+            <if test="csNh3 != null">CS_NH3 = #{csNh3},</if>
+            <if test="csTn != null">CS_TN = #{csTn},</if>
+            <if test="csTp != null">CS_TP = #{csTp},</if>
+            <if test="csDcgj != null">CS_DCGJ = #{csDcgj},</if>
+            <if test="jsSw != null">JS_SW = #{jsSw},</if>
+            <if test="csSw != null">CS_SW = #{csSw},</if>
+            <if test="shcOnePh != null">SHC_ONE_PH = #{shcOnePh},</if>
+            <if test="shcTwoPh != null">SHC_TWO_PH = #{shcTwoPh},</if>
+            <if test="shcHyOneSv != null">SHC_HY_ONE_SV = #{shcHyOneSv},</if>
+            <if test="shcHyTwoSv != null">SHC_HY_TWO_SV = #{shcHyTwoSv},</if>
+            <if test="shcHyOneSvi != null">SHC_HY_ONE_SVI = #{shcHyOneSvi},</if>
+            <if test="shcHyTwoSvi != null">SHC_HY_TWO_SVI = #{shcHyTwoSvi},</if>
+            <if test="shcHyOneMlss != null">SHC_HY_ONE_MLSS = #{shcHyOneMlss},</if>
+            <if test="shcHyTwoMlss != null">SHC_HY_TWO_MLSS = #{shcHyTwoMlss},</if>
+            <if test="shcHyOneMlvss != null">SHC_HY_ONE_MLVSS = #{shcHyOneMlvss},</if>
+            <if test="shcHyTwoMlvss != null">SHC_HY_TWO_MLVSS = #{shcHyTwoMlvss},</if>
+            <if test="shcYyOneDo != null">SHC_YY_ONE_DO = #{shcYyOneDo},</if>
+            <if test="shcYyTwoDo != null">SHC_YY_TWO_DO = #{shcYyTwoDo},</if>
+            <if test="shcQyOneDo != null">SHC_QY_ONE_DO = #{shcQyOneDo},</if>
+            <if test="shcQyTwoDo != null">SHC_QY_TWO_DO = #{shcQyTwoDo},</if>
+            <if test="shcHyOneDo != null">SHC_HY_ONE_DO = #{shcHyOneDo},</if>
+            <if test="shcHyTwoDo != null">SHC_HY_TWO_DO = #{shcHyTwoDo},</if>
+            <if test="JSL != null">JSL = #{JSL},</if>
+            <if test="CSL != null">CSL = #{CSL},</if>
+            <if test="SDCLCXSL != null">SDCLCXSL = #{SDCLCXSL},</if>
+            <if test="QSB != null">QSB = #{QSB},</if>
+            <if test="fM != null">F_M = #{fM},</if>
+            <if test="yyHrt != null">YY_HRT = #{yyHrt},</if>
+            <if test="hyHrt != null">HY_HRT = #{hyHrt},</if>
+            <if test="qyHrt != null">QY_HRT = #{qyHrt},</if>
+            <if test="nhlR != null">NHL_R = #{nhlR},</if>
+            <if test="whlR != null">WHL_R = #{whlR},</if>
+            <if test="SRT != null">SRT = #{SRT},</if>
+            <if test="CNL != null">CNL = #{CNL},</if>
+            <if test="tyqBod5Tn != null">TYQ_BOD5_TN = #{tyqBod5Tn},</if>
+            <if test="tyhBod5Tn != null">TYH_BOD5_TN = #{tyhBod5Tn},</if>
+            <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
+        </trim>
+        where ID = #{ID}
+    </update>
+
+    <delete id="deleteTXinyiDailyByID" parameterType="Long">
+        delete from t_xinyi_daily where ID = #{ID}
+    </delete>
+
+    <delete id="deleteTXinyiDailyByIDs" parameterType="String">
+        delete from t_xinyi_daily where ID in 
+        <foreach item="ID" collection="array" open="(" separator="," close=")">
+            #{ID}
+        </foreach>
+    </delete>
+</mapper>

slibra-system/src/main/resources/mapper/business/TXinyiIndustryMapper.xml

@@ -3,9 +3,11 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.slibra.business.mapper.TXinyiIndustryMapper">
-    
+
     <resultMap type="TXinyiIndustry" id="TXinyiIndustryResult">
         <result property="ID"    column="ID"    />
+        <result property="testDate"    column="TEST_DATE"    />
+        <result property="testHour"    column="TEST_HOUR"    />
         <result property="testTime"    column="TEST_TIME"    />
         <result property="jsCod"    column="JS_COD"    />
         <result property="jsPh"    column="JS_PH"    />
@@ -59,13 +61,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiIndustryVo">
-        select ID, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, CREATED_TIME from t_xinyi_industry
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, CREATED_TIME from t_xinyi_industry
     </sql>
 
     <select id="selectTXinyiIndustryList" parameterType="TXinyiIndustry" resultMap="TXinyiIndustryResult">
         <include refid="selectTXinyiIndustryVo"/>
         <where>
-            1 = 1
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
             <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
             <if test="jsCod != null "> and JS_COD = #{jsCod}</if>
             <if test="jsPh != null "> and JS_PH = #{jsPh}</if>
@@ -117,17 +120,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLJYSSLL != null "> and CLJYSSLL = #{CLJYSSLL}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
-        and del_flag = 0
     </select>
-    
+
     <select id="selectTXinyiIndustryByID" parameterType="Long" resultMap="TXinyiIndustryResult">
         <include refid="selectTXinyiIndustryVo"/>
-        where ID = #{ID} and del_flag = 0
+        where ID = #{ID}
     </select>
-        
+
     <insert id="insertTXinyiIndustry" parameterType="TXinyiIndustry" useGeneratedKeys="true" keyProperty="ID">
         insert into t_xinyi_industry
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="testDate != null">TEST_DATE,</if>
+            <if test="testHour != null">TEST_HOUR,</if>
             <if test="testTime != null">TEST_TIME,</if>
             <if test="jsCod != null">JS_COD,</if>
             <if test="jsPh != null">JS_PH,</if>
@@ -178,8 +182,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="SJTYJLY != null">SJTYJLY,</if>
             <if test="CLJYSSLL != null">CLJYSSLL,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="testDate != null">#{testDate},</if>
+            <if test="testHour != null">#{testHour},</if>
             <if test="testTime != null">#{testTime},</if>
             <if test="jsCod != null">#{jsCod},</if>
             <if test="jsPh != null">#{jsPh},</if>
@@ -230,12 +236,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="SJTYJLY != null">#{SJTYJLY},</if>
             <if test="CLJYSSLL != null">#{CLJYSSLL},</if>
             <if test="createdTime != null">#{createdTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTXinyiIndustry" parameterType="TXinyiIndustry">
         update t_xinyi_industry
         <trim prefix="SET" suffixOverrides=",">
+            <if test="testDate != null">TEST_DATE = #{testDate},</if>
+            <if test="testHour != null">TEST_HOUR = #{testHour},</if>
             <if test="testTime != null">TEST_TIME = #{testTime},</if>
             <if test="jsCod != null">JS_COD = #{jsCod},</if>
             <if test="jsPh != null">JS_PH = #{jsPh},</if>
@@ -290,14 +298,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{ID}
     </update>
 
-    
-
     <delete id="deleteTXinyiIndustryByID" parameterType="Long">
-        update t_xinyi_industry set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID = #{ID}
+        delete from t_xinyi_industry where ID = #{ID}
     </delete>
 
     <delete id="deleteTXinyiIndustryByIDs" parameterType="String">
-        update t_xinyi_industry set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID in
+        delete from t_xinyi_industry where ID in
         <foreach item="ID" collection="array" open="(" separator="," close=")">
             #{ID}
         </foreach>

slibra-system/src/main/resources/mapper/business/TXinyiLaboratoryMapper.xml

@@ -3,9 +3,11 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.slibra.business.mapper.TXinyiLaboratoryMapper">
-    
+
     <resultMap type="TXinyiLaboratory" id="TXinyiLaboratoryResult">
         <result property="ID"    column="ID"    />
+        <result property="testDate"    column="TEST_DATE"    />
+        <result property="testHour"    column="TEST_HOUR"    />
         <result property="testTime"    column="TEST_TIME"    />
         <result property="oneHycxsy"    column="ONE_HYCXSY"    />
         <result property="twoHycxsy"    column="TWO_HYCXSY"    />
@@ -20,13 +22,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiLaboratoryVo">
-        select ID, TEST_TIME, ONE_HYCXSY, TWO_HYCXSY, ONE_QYCKXSY, TWO_QYCKXSY, ZL, ONE_HY_ZLSY, TWO_HY_ZLSY, ONE_QYAD, TWO_QYAD, CREATED_TIME from t_xinyi_laboratory
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, ONE_HYCXSY, TWO_HYCXSY, ONE_QYCKXSY, TWO_QYCKXSY, ZL, ONE_HY_ZLSY, TWO_HY_ZLSY, ONE_QYAD, TWO_QYAD, CREATED_TIME from t_xinyi_laboratory
     </sql>
 
     <select id="selectTXinyiLaboratoryList" parameterType="TXinyiLaboratory" resultMap="TXinyiLaboratoryResult">
         <include refid="selectTXinyiLaboratoryVo"/>
         <where>
-            1 = 1
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
             <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
             <if test="oneHycxsy != null "> and ONE_HYCXSY = #{oneHycxsy}</if>
             <if test="twoHycxsy != null "> and TWO_HYCXSY = #{twoHycxsy}</if>
@@ -39,17 +42,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="twoQyad != null "> and TWO_QYAD = #{twoQyad}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
-        and del_flag = 0
     </select>
-    
+
     <select id="selectTXinyiLaboratoryByID" parameterType="Long" resultMap="TXinyiLaboratoryResult">
         <include refid="selectTXinyiLaboratoryVo"/>
-        where ID = #{ID} and del_flag = 0
+        where ID = #{ID}
     </select>
-        
+
     <insert id="insertTXinyiLaboratory" parameterType="TXinyiLaboratory" useGeneratedKeys="true" keyProperty="ID">
         insert into t_xinyi_laboratory
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="testDate != null">TEST_DATE,</if>
+            <if test="testHour != null">TEST_HOUR,</if>
             <if test="testTime != null and testTime != ''">TEST_TIME,</if>
             <if test="oneHycxsy != null">ONE_HYCXSY,</if>
             <if test="twoHycxsy != null">TWO_HYCXSY,</if>
@@ -61,8 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oneQyad != null">ONE_QYAD,</if>
             <if test="twoQyad != null">TWO_QYAD,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="testDate != null">#{testDate},</if>
+            <if test="testHour != null">#{testHour},</if>
             <if test="testTime != null and testTime != ''">#{testTime},</if>
             <if test="oneHycxsy != null">#{oneHycxsy},</if>
             <if test="twoHycxsy != null">#{twoHycxsy},</if>
@@ -74,12 +80,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oneQyad != null">#{oneQyad},</if>
             <if test="twoQyad != null">#{twoQyad},</if>
             <if test="createdTime != null">#{createdTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTXinyiLaboratory" parameterType="TXinyiLaboratory">
         update t_xinyi_laboratory
         <trim prefix="SET" suffixOverrides=",">
+            <if test="testDate != null">TEST_DATE = #{testDate},</if>
+            <if test="testHour != null">TEST_HOUR = #{testHour},</if>
             <if test="testTime != null and testTime != ''">TEST_TIME = #{testTime},</if>
             <if test="oneHycxsy != null">ONE_HYCXSY = #{oneHycxsy},</if>
             <if test="twoHycxsy != null">TWO_HYCXSY = #{twoHycxsy},</if>
@@ -95,14 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{ID}
     </update>
 
-    
-
     <delete id="deleteTXinyiLaboratoryByID" parameterType="Long">
-        update t_xinyi_laboratory set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID = #{ID}
+        delete from t_xinyi_laboratory where ID = #{ID}
     </delete>
 
     <delete id="deleteTXinyiLaboratoryByIDs" parameterType="String">
-        update t_xinyi_laboratory set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID in
+        delete from t_xinyi_laboratory where ID in
         <foreach item="ID" collection="array" open="(" separator="," close=")">
             #{ID}
         </foreach>