修改合同bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractPageDto.java

@@ -41,5 +41,5 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
 
 
     private String userId;
-
+    private String contractNumber;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/config/MysqlServerConfig.java

 package com.yeejoin.amos.boot.module.hygf.biz.config;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInterceptor;
+import com.yeejoin.amos.boot.biz.common.annotation.FillCommonUserField;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.config.MetaHandler;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
@@ -20,9 +32,12 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.sql.DataSource;
 import java.util.Collections;
+import java.util.Date;
+import java.util.Objects;
 import java.util.Properties;
 
 
@@ -34,7 +49,8 @@ import java.util.Properties;
 @MapperScan(basePackages = {"com.yeejoin.amos.boot.module.hygf.api.mapper"}, sqlSessionTemplateRef  = "mysqlSqlSessionTemplate")
 public class MysqlServerConfig {
 
-
+    @Autowired
+    MetaHandler metaHandler;
     private static final String MAPPER_LOCATION = "classpath*:mapper/mysql/*.xml";
     @Bean(name = "mysqlDataSource")
     @ConfigurationProperties(prefix = "spring.datasource.mysql-service")
@@ -52,6 +68,9 @@ public class MysqlServerConfig {
         bean.setDataSource(dataSource);
         bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(MAPPER_LOCATION));
 
+
+        globalConfig.setMetaObjectHandler(metaHandler);
+        bean.setGlobalConfig(globalConfig);
         //分页插件
         Interceptor interceptor = new PageInterceptor();
         Properties properties = new Properties();
@@ -92,4 +111,5 @@ public class MysqlServerConfig {
 
 
 
+
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java

@@ -68,6 +68,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         //列表数据组装
         QueryWrapper<HouseholdContract> qw = new QueryWrapper<>();
         qw.like(StringUtils.isNotEmpty(dto.getName()), "name", dto.getName());
+        qw.like(StringUtils.isNotEmpty(dto.getContractNumber()), "contract_number", dto.getContractNumber());
         qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
 
         qw.eq(dto.getPeasantHouseholdId()!=null, "peasant_household_id",dto.getPeasantHouseholdId() );

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -21,6 +21,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.filefilter.FalseFileFilter;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,6 +129,9 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                 powerStation.setNodeRole(workDto.getNodeRole());
                 powerStation.setNodeRouting(workDto.getNodeRouting());
             }
+
+            powerStation.setRecDate(new Date());
+
             Boolean fl= this.saveOrUpdate(powerStation);
 
             PowerStationNodeEnum powerStationNodeEnum=   PowerStationNodeEnum.getNodeByCode(powerStation.getNextProcessNode());