Explorar el Código

0704 修改项目求解

caizm hace 2 meses
padre
commit
7602d99ce2

+ 4 - 5
modelsrc/com/miniframe/model/es/EsProResultValue.java

@@ -2,7 +2,6 @@ package com.miniframe.model.es;
 
 import com.miniframe.system.MiniserviceBaseModel;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 
@@ -29,7 +28,7 @@ public class EsProResultValue extends MiniserviceBaseModel implements Serializab
     @Column(name = "job_id")
     private String jobId;
 
-    private BigDecimal value;
+    private String value;
 
     /**
      * 用户编码
@@ -151,15 +150,15 @@ public class EsProResultValue extends MiniserviceBaseModel implements Serializab
     /**
      * @return value
      */
-    public BigDecimal getValue() {
+    public String getValue() {
         return value;
     }
 
     /**
      * @param value
      */
-    public void setValue(BigDecimal value) {
-        this.value = value;
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
     }
 
     /**

+ 20 - 11
modelsrc/com/miniframe/model/es/EsProResultValueSQLBuilder.java

@@ -1,6 +1,5 @@
 package com.miniframe.model.es;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -536,52 +535,62 @@ public class EsProResultValueSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andValueEqualTo(BigDecimal value) {
+        public Criteria andValueEqualTo(String value) {
             addCriterion("value =", value, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotEqualTo(BigDecimal value) {
+        public Criteria andValueNotEqualTo(String value) {
             addCriterion("value <>", value, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueGreaterThan(BigDecimal value) {
+        public Criteria andValueGreaterThan(String value) {
             addCriterion("value >", value, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andValueGreaterThanOrEqualTo(String value) {
             addCriterion("value >=", value, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueLessThan(BigDecimal value) {
+        public Criteria andValueLessThan(String value) {
             addCriterion("value <", value, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andValueLessThanOrEqualTo(String value) {
             addCriterion("value <=", value, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueIn(List<BigDecimal> values) {
+        public Criteria andValueLike(String value) {
+            addCriterion("value like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotLike(String value) {
+            addCriterion("value not like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<String> values) {
             addCriterion("value in", values, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotIn(List<BigDecimal> values) {
+        public Criteria andValueNotIn(List<String> values) {
             addCriterion("value not in", values, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andValueBetween(String value1, String value2) {
             addCriterion("value between", value1, value2, "value");
             return (Criteria) this;
         }
 
-        public Criteria andValueNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andValueNotBetween(String value1, String value2) {
             addCriterion("value not between", value1, value2, "value");
             return (Criteria) this;
         }

+ 1 - 1
modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Tue Jun 17 17:01:52 CST 2025.
+    This file was generated on Thu Jul 03 17:42:32 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />

+ 1 - 1
modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Tue Jun 17 17:01:52 CST 2025.
+    This file was generated on Thu Jul 03 17:42:33 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 2 - 2
src/main/java/com/miniframe/bisiness/es/ES0013Service.java

@@ -172,7 +172,7 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
 						keyList.add(pcrId);
 					}else if(j>1){
                         if(k==0)++step;
-						insertIntoTbValue(new BigDecimal(data.get(j).get(k)),jobId,Integer.valueOf(step),comId,keyList.get(k),pcId);
+						insertIntoTbValue(data.get(j).get(k),jobId,Integer.valueOf(step),comId,keyList.get(k),pcId);
 
 					}
 				}
@@ -181,7 +181,7 @@ public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
 	}
 
 
-	private void insertIntoTbValue(BigDecimal value,String job_id,Integer step,String comId,String pcrId,String pcId) throws Exception{
+	private void insertIntoTbValue(String value,String job_id,Integer step,String comId,String pcrId,String pcId) throws Exception{
 		EsProResultValueMapper eprvMapper = UtilTools.getBean(EsProResultValueMapper.class);
 		EsProResultValue eprv = new EsProResultValue();
 		eprv.setPcrvId(UtilTools.getUUid());

+ 1 - 1
src/main/java/com/miniframe/bisiness/es/ES0015Service.java

@@ -65,7 +65,7 @@ public class ES0015Service extends ES0015BaseModel implements ExecProcessFlow {
 				comsRecode.setComId(value.getComId());
 				comsRecode.setPcId(value.getPcId());
 				comsRecode.setJobId(value.getJobId());
-				comsRecode.setValue(value.getValue().toString());
+				comsRecode.setValue(value.getValue());
 				comsRecode.setUid(value.getUid());
 				comsRecode.setCreateTime(XIDateTimeUtils.getStrFromDate(value.getCreateTime()));
 				comsRecode.setUpdateTime(XIDateTimeUtils.getStrFromDate(value.getUpdateTime()));