土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExpReportTemplateServiceImpl.java

@@ -46,10 +46,17 @@ public class SoilExpReportTemplateServiceImpl extends BaseServiceImpl<SoilExpRep
             soilExpReportTemplate.setName(null);
         }
 
+
+        if (StringUtils.isNotBlank(soilExpReportTemplate.getAlias())){
+            wrapper.like("alias",soilExpReportTemplate.getAlias());
+            soilExpReportTemplate.setAlias(null);
+        }
+
         if (StringUtils.isNotBlank(soilExpReportTemplate.getClassType())){
             wrapper.like("class_type",soilExpReportTemplate.getClassType());
             soilExpReportTemplate.setClassType(null);
         }
+        wrapper.orderBy("ctime");
         return this.page(page, wrapper);
     }
 

src/main/resources/mapper/soil/SoilEntrustMapper.xml

@@ -159,7 +159,7 @@
             AND  TO_CHAR(e.entrust_date, 'yyyy') = #{vo.entrustDate}
         </if>
         AND e.entrust_date IS NOT NULL
-        GROUP BY entrust_date ORDER BY entrust_date
+        GROUP BY TO_CHAR(e.entrust_date, 'yyyy-MM') ORDER BY entrust_date
     </select>
 
 

src/test/java/resources/db_sql/v1.1.7/新增sql.sql

+ALTER TABLE "public"."soil_exp_report_template" 
+ALTER TABLE "public"."soil_exp_report_template" 
+  ADD COLUMN "deleted" int2 DEFAULT 0;
+
+COMMENT ON COLUMN "public"."soil_exp_report_template"."deleted" IS '是否删除0否1是';
+
+
+
+
+ALTER TABLE "public"."soil_original_template" 
+  ADD COLUMN "deleted" int2 DEFAULT 0;
+
+COMMENT ON COLUMN "public"."soil_original_template"."deleted" IS '是否删除0否1是';
\ No newline at end of file