Merge branch 'dev0124-01' into developer

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdJpStation.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/4/2
+ */
+
+@Data
+@TableName(value = "td_hygf_jp_station" ,autoResultMap = true)
+public class TdJpStation implements Serializable {
+    private Long createdTime;
+    private String thirdStationId; //采集电站id
+    private String regionalCompaniesCode; //区域公司code
+    private String amosCompanyCode; //经销商code
+    private String thirdCode ;//厂商标识
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdJpStationMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdJpStation;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/4/2
+ */
+
+public interface TdJpStationMapper  extends BaseMapper<TdJpStation> {
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -101,6 +101,10 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 
     @Autowired
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
+    @Autowired
+    TdJpStationMapper tdJpStationMapper;
+
+
 
     @Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
     @Async
@@ -204,6 +208,29 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 } else {
                     jpStationMapper.insert(jpStation);
                 }
+
+                //增加td 电站区域公司，经销商绑定表
+                TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
+                eq("third_code", PVProducerInfoEnum.JLY.getCode()).
+                eq("third_station_id", stationIds.get(i)));
+                //判断是否存在
+                if (ObjectUtils.isEmpty(tdJpStation)) {
+                    tdJpStation = new TdJpStation();
+                }
+                tdJpStation.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                tdJpStation.setThirdStationId(stationIds.get(i));
+                tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
+                tdJpStation.setCreatedTime(System.currentTimeMillis());
+                if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
+                    tdJpStationMapper.updateById(tdJpStation);
+                } else {
+                    tdJpStationMapper.insert(tdJpStation);
+                }
+
+
+
+
                 HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
                 hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
                 hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -114,7 +114,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
     @Autowired
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
-
+    @Autowired
+    TdJpStationMapper tdJpStationMapper;
 
     @Scheduled(cron = "${dataRequstScheduled.huawei}")
     @Override
@@ -299,6 +300,33 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             } else {
                 jpStationMapper.insert(jpStation);
             }
+
+
+            //增加td 电站区域公司，经销商绑定表
+            TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
+                    eq("third_code",PVProducerInfoEnum.HUAWEI.getCode()).
+                    eq("third_station_id",  imasterStationList.getPlantCode()));
+            //判断是否存在
+            if (ObjectUtils.isEmpty(tdJpStation)) {
+                tdJpStation = new TdJpStation();
+            }
+            tdJpStation.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+            tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+            tdJpStation.setThirdStationId( imasterStationList.getPlantCode());
+            tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
+            tdJpStation.setCreatedTime(System.currentTimeMillis());
+            if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
+                tdJpStationMapper.updateById(tdJpStation);
+            } else {
+                tdJpStationMapper.insert(tdJpStation);
+            }
+
+
+
+
+
+
+
             HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
             hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
             hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -108,7 +108,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
     private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
     @Autowired
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
-
+    @Autowired
+    TdJpStationMapper tdJpStationMapper;
+    
     @Scheduled(cron = "${dataRequstScheduled.keshida}")
     @Override
     public void stationList() {
@@ -237,6 +239,40 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                         jpStationMapper.insert(jpStation);
                     }
 
+
+
+
+                    //增加td 电站区域公司，经销商绑定表
+                    TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
+                            eq("third_code",PVProducerInfoEnum.KSOLAR.getCode()).
+                            eq("third_station_id",  ksolarStation.getStationId()));
+                    //判断是否存在
+                    if (ObjectUtils.isEmpty(tdJpStation)) {
+                        tdJpStation = new TdJpStation();
+                    }
+                    tdJpStation.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                    tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                    tdJpStation.setThirdStationId( ksolarStation.getStationId());
+                    tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
+                    tdJpStation.setCreatedTime(System.currentTimeMillis());
+                    if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
+                        tdJpStationMapper.updateById(tdJpStation);
+                    } else {
+                        tdJpStationMapper.insert(tdJpStation);
+                    }
+
+
+
+
+
+
+
+
+
+
+
+
+
                     HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
                     hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
                     hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/ArrivalStateeEnum.java

@@ -16,7 +16,29 @@ public enum ArrivalStateeEnum {
 
     已收货("已收货", "已收货"),
 
-    已作废("已作废", "已作废");
+    已作废("已作废", "已作废"),
+
+
+    待勘察("待勘察", "待勘察"),
+    勘察中("勘察中", "勘察中"),
+    勘察完成 ("勘察完成", "勘察完成"),
+    备货中("备货中", "备货中"),
+    备货完成("备货完成", "备货完成"),
+    施工中("施工中", "施工中"),
+    施工完成 ("施工完成", "施工完成"),
+    并网中("并网中", "并网中"),
+    并网完成("并网完成", "并网完成"),
+    线上验收("线上验收", "线上验收"),
+    线下验收("线下验收", "线下验收"),
+    验收完成("验收完成", "验收完成");
+
+
+
+
+
+
+
+
 
     /**
      * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/DealerRestrict.java

+package com.yeejoin.amos.boot.module.hygf.api.config;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface DealerRestrict {
+
+    String[] field();
+    /**
+     * @param 每个字段运算符( in,like,likeLeft,likeRight,eq)
+     */
+    String[] fieldConditions() ;
+    /**
+     * @param 多个字段之间关系（or,and）
+     */
+    String relationship() default "";
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpower.java

@@ -23,14 +23,21 @@ public @interface UserEmpower {
      */
     String[] field();
     /**
+     * @param 经销商字段(Field1,Field2)
+     */
+    String[] dealerField() default {};
+    /**
      * @param 每个字段运算符( in,like,likeLeft,likeRight,eq)
      */
     String[] fieldConditions() ;
     /**
      * @param 多个字段之间关系（or,and）
      */
-    String relationship() default "";
-
+    String[] relationship();
 
+    /**
+     * @param 是否特有（or,and）
+     */
+    boolean specific() default true;
 }
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.config;
 
 
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.mapping.BoundSql;
@@ -15,91 +19,217 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 
 @Intercepts({@Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class,
         RowBounds.class, ResultHandler.class}), @Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
 public class UserEmpowerInterceptor implements Interceptor {
 
+
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+
+
+
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
-        try {
-        StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
-        MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
-        MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
-        //获取方法注解
-        Method method = getTargetDataAuthMethod(mappedStatement);
-        UserEmpower userEmpower = getTargetDataAuthAnnotation(mappedStatement);
-        if(userEmpower==null){
-          return invocation.proceed();
-        }
-        //获取字段
-        String[] filed= userEmpower.field();
-        //获取字段条件表达式
-        String[] fileCondition= userEmpower.fieldConditions();
-        //获取 参数之间关系
-        String fileBetweenCondition=  userEmpower.relationship();
-        //获取参数值，
-        List<String> orgCode = UserEmpowerThreadLocal.getDataAuthRule();
-        BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
-        //获取sql
-        String sql = boundSql.getSql();
-        //拼接参数
-        List<String> sq= selectSql(filed, fileCondition,  orgCode);
-        String sqldata=" ";
-        if(sq!=null&&sq.size()>0){
-
-            if(fileCondition.length==1){
-
-                sqldata= sqldata+sq.get(0);
 
-            }else{
-                if(fileBetweenCondition!=null&&!fileBetweenCondition.isEmpty()){
 
-                    for (int i = 0; i < sq.size(); i++) {
-                        if(i==sq.size()-1){
-                            sqldata= sqldata+sq.get(i);
-                        }else{
-                            sqldata= sqldata+sq.get(i)+" "+fileBetweenCondition+" ";
+
+            try {
+                if (null == redisUtils ){
+                    return invocation.proceed();
+                }
+                StdUserEmpower orgCode =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
+
+
+
+                if(orgCode!=null&& orgCode.isFlag()&&!orgCode.isFarmer()){
+                    StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
+                    MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
+                    MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
+                    //获取方法注解
+              //      Method method = getTargetDataAuthMethod(mappedStatement);
+                    UserEmpower userEmpower;
+                    if (mappedStatement.getId().contains("_COUNT")){
+                        String id  = mappedStatement.getId().replace("_COUNT", "");
+                        userEmpower = getTargetDataAuthAnnotationCount(id);
+                        if (userEmpower == null) {
+                            return invocation.proceed();
                         }
+                    }else {
+                        userEmpower = getTargetDataAuthAnnotation(mappedStatement);
                     }
-                }else{
-                    sqldata=" ";
-                }
-            }
-        }
 
-        Select select = (Select) CCJSqlParserUtil.parse(sql);
-        PlainSelect selectBody = (PlainSelect) select.getSelectBody();
-        if (!ValidationUtil.isEmpty(sqldata.trim())) {
+                    if(userEmpower==null){
+                        return invocation.proceed();
+                    }
+                    //StdUserEmpower orgCode = UserEmpowerThreadLocal.getDataAuthRule();
+
+
+                    if(orgCode!=null&&orgCode.isFlag()){
+                        //获取字段
+                        String[] filed= userEmpower.field();
+                        //获取字段条件表达式
+                        String[] fileCondition= userEmpower.fieldConditions();
+                        //获取 参数之间关系
+                        String[] fileBetweenCondition=  userEmpower.relationship();
+                        //获取  是否特殊
+                        Boolean specific= userEmpower.specific();
+
+
+                        BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
+                        //获取sql
+                        String sql = boundSql.getSql();
+                        //拼接参数
+                        List<String> sq= selectSql(filed, fileCondition,  orgCode,specific);
+                        String sqldata=" ";
+                        if(sq!=null&&sq.size()>0){
+
+                            if(fileCondition.length==1){
+
+                                sqldata= sqldata+sq.get(0);
+
+                            }else{
+                                if(fileBetweenCondition!=null&&fileBetweenCondition.length>0){
+
+                                    for (int i = 0; i < sq.size(); i++) {
+                                        if(i==sq.size()-1){
+                                            sqldata= sqldata+sq.get(i);
+                                        }else{
+                                            sqldata= sqldata+sq.get(i)+" "+fileBetweenCondition[i]+" ";
+                                        }
+                                    }
+                                }else{
+                                    sqldata=" ";
+                                }
+                            }
+                        }
 
-        } else {
-            sqldata=" 1= 2 ";
-        }
+                        Select select = (Select) CCJSqlParserUtil.parse(sql);
+                        PlainSelect selectBody = (PlainSelect) select.getSelectBody();
+                        if (!ValidationUtil.isEmpty(sqldata.trim())) {
+
+                        } else {
+                            sqldata=" 1= 2 ";
+                        }
+
+                        if (ValidationUtil.isEmpty(selectBody.getWhere())) {
+                            selectBody.setWhere(CCJSqlParserUtil.parseCondExpression(sqldata));
+                        } else {
+                            AndExpression andExpr = new AndExpression(selectBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));
+                            selectBody.setWhere(andExpr);
+                        }
+                        System.out.println(selectBody.toString());
+                        metaObject.setValue("delegate.boundSql.sql", selectBody.toString());
+                    }else{
+                        return invocation.proceed();
+                    }
+                }else if(orgCode!=null&& !orgCode.isFlag()&&!orgCode.isFarmer()){
+                   //经销商
+                    StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
+                    MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
+                    MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
+                    //获取方法注解
+                    BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
+                    String sql = boundSql.getSql();
+                    UserEmpower userEmpower ;
+                    if (mappedStatement.getId().contains("_COUNT")){
+                            String id  = mappedStatement.getId().replace("_COUNT", "");
+                            userEmpower = getTargetDataAuthAnnotationCount(id);
+                            if (userEmpower == null) {
+                                return invocation.proceed();
+                            }
+                    }else {
+                         userEmpower = getTargetDataAuthAnnotation(mappedStatement);
+                        if (userEmpower == null) {
+                            return invocation.proceed();
+                        }
+                    }
+
+                    //获取字段
+                    String[] filed = userEmpower.dealerField();
+
+                    if (filed.length < 1){
+                        return invocation.proceed();
+                    }
+
+                    //获取字段条件表达式
+                    String[] fileCondition = userEmpower.fieldConditions();
+                    //获取  是否特殊
+                    Boolean specific= userEmpower.specific();
+                    //获取参数值，
+                    StdUserEmpower dataAuthRule =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
+                    String[] data = new String[]{String.join(",",dataAuthRule.getAmosOrgCode()),dataAuthRule.getAdminRegionalCompaniesCode() == null? dataAuthRule.getRegionalCompaniesCode():dataAuthRule.getAdminRegionalCompaniesCode(),dataAuthRule.getUserId(),dataAuthRule.getRegionalCompaniesCode()};
+                    List<String> list = new ArrayList<>(Arrays.asList(data));
+                    list.removeAll(Collections.singleton(null));
+
+                    List<String> sq ;
+                    //获取sql
+                    List<String> fileds = Arrays.asList(filed);
+                    if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode())  && fileds.size() >1) {
+                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
+                    } else if (!ValidationUtil.isEmpty(dataAuthRule.getUserId())) {
+                        sq = selectSqlJXS(new String[]{fileds.get(0),fileds.get(1),fileds.size()<3?fileds.get(0):fileds.get(2)},new String[]{fileCondition[0],fileCondition[1],fileCondition[2]} , list);
+                    } else {
+                        sq = selectSqlJXS(new String[]{fileds.get(0)}, fileCondition, specific?list:Arrays.asList(list.get(1)));
+                    }
+
+                    String sqldata = " ";
+                    if (sq != null && sq.size() > 0) {
+
+                        if (fileCondition.length == 1) {
+
+                            sqldata = sqldata + sq.get(0);
+
+                        } else {
+
+                                for (int i = 0; i < sq.size(); i++) {
+                                    if (i == sq.size() - 1) {
+                                        sqldata = sqldata + sq.get(i);
+                                    } else {
+                                        sqldata = sqldata + sq.get(i) + " " + "and" + " ";
+                                    }
+                                }
+
+                        }
+                    }
+
+                    Select select = (Select) CCJSqlParserUtil.parse(sql);
+                    PlainSelect selectBody = (PlainSelect) select.getSelectBody();
+                    if (!ValidationUtil.isEmpty(sqldata.trim())) {
+
+                    } else {
+                        sqldata = " 1= 2 ";
+                    }
+
+                    if (ValidationUtil.isEmpty(selectBody.getWhere())) {
+                        selectBody.setWhere(CCJSqlParserUtil.parseCondExpression(sqldata));
+                    } else {
+                        AndExpression andExpr = new AndExpression(selectBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));
+                        selectBody.setWhere(andExpr);
+                    }
+                    System.out.println(selectBody.toString());
+                    metaObject.setValue("delegate.boundSql.sql", selectBody.toString());
+
+                }
+
+            }catch (Exception e){
+                e.printStackTrace();
+                throw new BadRequest("权限认证失败！");
+            }finally {
+            }
+            return invocation.proceed();
 
-        if (ValidationUtil.isEmpty(selectBody.getWhere())) {
-            selectBody.setWhere(CCJSqlParserUtil.parseCondExpression(sqldata));
-        } else {
-            AndExpression andExpr = new AndExpression(selectBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));
-            selectBody.setWhere(andExpr);
-        }
-            System.out.println(selectBody.toString());
-        metaObject.setValue("delegate.boundSql.sql", selectBody.toString());
-
-        }catch (Exception e){
-            e.printStackTrace();
-            throw new BadRequest("权限认证失败！");
-        }finally {
-            UserEmpowerThreadLocal.clean();
-        }
-        return invocation.proceed();
     }
 
     @Override
@@ -116,19 +246,98 @@ public class UserEmpowerInterceptor implements Interceptor {
     }
 
 
-    private List<String> selectSql(String[] filed,String[] fileCondition, List<String> data){
+    private List<String> selectSql(String[] filed,String[] fileCondition, StdUserEmpower stdUserEmpower,boolean specific){
         List<String> sql=new ArrayList<>();
-        if(filed!=null&&filed.length>0&&fileCondition!=null&&fileCondition.length>0&&data!=null&&data.size()>0){
 
-            for (int i = 0; i < filed.length; i++) {
-                String sq=" ";
-                sq= getCondition(filed[i],fileCondition[i],data);
-                sql.add(sq);
+      if(specific){
+          List<String> data= stdUserEmpower.getAmosOrgCode();
+          List<String> notdata= stdUserEmpower.getEliminateAmosOrgCode();
+          List<String> wnotdata= stdUserEmpower.getNOeliminateAmosOrgCode();
+          if( filed!=null&&filed.length>0){
+
+              for (int i = 0; i < filed.length; i++) {
+                  String sq=" ";
+                  sq= getConditiontd(filed[i],fileCondition[i],data,notdata,wnotdata);
+                  sql.add(sq);
+              }
+          }
+      }else{
+          List<String> data= stdUserEmpower.getAmosOrgCode();
+          List<String> notdata= stdUserEmpower.getEliminateAmosOrgCode();
+          List<String> wnotdata= stdUserEmpower.getNOeliminateAmosOrgCode();
+
+          if( filed!=null&&filed.length>0){
+
+              for (int i = 0; i < filed.length; i++) {
+                  String sq=" ";
+                  sq= getConditiontd(filed[i],fileCondition[i],data,notdata,wnotdata);
+                  sql.add(sq);
+              }
+          }
+      }
+
+
+
+        return sql;
+    }
+
+    //特定管理端条件
+    private String getConditiontd(String filed,String type, List<String> data, List<String> wdata, List<String> wnotdata){
+        String sql=" ";
+
+        if(data==null||data.size()==0){
+
+            //内部不选   外部不选
+            if(wdata==null||wdata.size()==0){
+                //返回空不处理
+                sql=" ";
+            }
+
+            //内部不选    外部全部
+            //内部不选    外部选一部分
+            if(wdata!=null&&wdata.size()>0){
+
+                sql = sql+getInData( filed,wdata);
+            }
+
+        }else if(data.contains("all")){
+
+            //内部全选， 外部不选
+            if(wdata==null||wdata.size()==0){
+                sql = sql+ getnotInData( filed,wnotdata);
+            }
+            //内部全选， 外度全选
+            if(wdata!=null&&wdata.size()!=0&&wnotdata==null){
+                //返回恒等看所有
+                sql= sql+" 1=1 ";
+            }
+            //内部全选， 外部选一部分
+            if(wdata!=null&&wdata.size()!=0&&wnotdata!=null){
+                //返回恒等看所有
+                sql = sql+getnotInData( filed,wnotdata);
+            }
+        }else{
+            //内部选一部分， 外度全选
+            if(wdata!=null&&wdata.size()!=0&&wnotdata==null){
+
+                sql = sql+getInData( filed,data);
+            }
+            //内部选一部分   外部选一部分
+            if(wdata!=null&&wdata.size()!=0&&wnotdata!=null){
+
+                data.addAll(wdata);
+                sql = sql+getInData( filed,data);
+            }
+            //内部选一部分    外部不选
+            if(wdata==null||wdata.size()==0){
+                sql = sql+getInData( filed,data);
             }
         }
         return sql;
     }
 
+
+
     private String getCondition(String filed,String type, List<String> data){
         String sql=" ";
         switch (type) {
@@ -141,8 +350,47 @@ public class UserEmpowerInterceptor implements Interceptor {
                 }else{
 
                 }
+                break;
+            case "likeLeft":
+                if(data.size()==1){
+                    sql = sql+getlikeLeftData(filed,data);
+                }else{
+
+                }
+
+                break;
+            case "likeRight":
+
+                if(data.size()==1){
+                    sql = sql+getlikeRightData(filed,data);
+                }else{
+
+                }
+                break;
+            case "eq":
+
+                if(data.size()==1){
+                    sql = sql+getData(filed,data);
+                }else{
+                    sql = sql+getData(filed,data);
+                }
+                break;
+        }
+        return sql;
+    }
 
+    private String getConditionJXS(String filed,String type, List<String> data){
+        String sql=" ";
+        switch (type) {
+            case "in":
+                sql = sql+getInDataJXS( filed,data);
+                break;
+            case "like":
+                if(data.size()==1){
+                    sql = sql+getlikeData(filed,data);
+                }else{
 
+                }
                 break;
             case "likeLeft":
                 if(data.size()==1){
@@ -165,7 +413,7 @@ public class UserEmpowerInterceptor implements Interceptor {
                 if(data.size()==1){
                     sql = sql+getData(filed,data);
                 }else{
-
+                    sql = sql+getData(filed,data);
                 }
                 break;
         }
@@ -182,15 +430,43 @@ public class UserEmpowerInterceptor implements Interceptor {
         }
         return filed+" in "+sql;
     }
+
+    private String getInDataJXS( String filed,List<String> data){
+
+        List<String> list = Arrays.asList(data.get(0).split(","));
+        String sql=" ( ";
+        for (int i = 0; i < list.size(); i++) {
+            if(i==list.size()-1){
+                sql=sql+"'" +list.get(i)+"' ) ";
+            }else{
+                sql=sql+"'"+ list.get(i)+"',";
+            }
+        }
+        return filed+" in "+sql;
+    }
+
+
+    private String getnotInData( String filed,List<String> data){
+        String sql=" ( ";
+        for (int i = 0; i < data.size(); i++) {
+            if(i==data.size()-1){
+                sql=sql+"'" +data.get(i)+"' ) ";
+            }else{
+                sql=sql+"'"+ data.get(i)+"',";
+            }
+        }
+        return filed+" not in "+sql;
+    }
+
     private String getData(  String filed,List<String> data){
         String sql="";
         if(data.size()==1){
 
-            sql= sql+filed+" = "+data.get(0);
+            sql= sql+filed+" = '"+data.get(0)+"'";
         }else{
             for (int i = 0; i < data.size(); i++) {
                 if(i==data.size()-1){
-                    sql= sql+filed+" = "+data.get(i)+" ";
+                    sql= sql+filed+" = '"+data.get(i)+"' ";
                 }else{
                     sql= sql+filed+" = "+data.get(i)+"  and  ";;
                 }
@@ -236,23 +512,6 @@ public class UserEmpowerInterceptor implements Interceptor {
 
         return sql;
     }
-    private String getlikeData(  String filed,List<String> data){
-        String sql="";
-        if(data.size()==1){
-
-            sql= sql+filed+" = "+"%"+data.get(0)+"%";
-        }else {
-            for (int i = 0; i < data.size(); i++) {
-                if (i == data.size() - 1) {
-                    sql = sql + filed + " = " + "%"+data.get(i)+"%" +" ";
-                } else {
-                    sql = sql + filed + " = " + "%"+data.get(i)+"%" +"  and  ";
-                }
-            }
-        }
-
-        return sql;
-    }
 
 
 
@@ -281,6 +540,20 @@ public class UserEmpowerInterceptor implements Interceptor {
         return null;
     }
 
+    private Method getTargetDataAuthMethodCount(String id) throws ClassNotFoundException {
+        String className = id.substring(0, id.lastIndexOf("."));
+        String methodName = id.substring(id.lastIndexOf(".") + 1);
+        final Class<?> cls = Class.forName(className);
+        final Method[] methods = cls.getMethods();
+        for (Method method : methods) {
+            // TODO 后续重载方法需要优化
+            if (method.getName().equals(methodName) && method.isAnnotationPresent(UserEmpower.class)) {
+                return method;
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取当前执行语句对应mapper方法的DataAuth注解
      *
@@ -295,4 +568,53 @@ public class UserEmpowerInterceptor implements Interceptor {
         return getTargetDataAuthMethod(mappedStatement).getAnnotation(UserEmpower.class);
     }
 
+    private List<String> selectSqlJXS(String[] filed, String[] fileCondition, List<String> data) {
+        List<String> sql = new ArrayList<>();
+        if (filed != null && filed.length > 0 && fileCondition != null && fileCondition.length > 0 && data != null && data.size() > 0) {
+
+            for (int i = 0; i < filed.length; i++) {
+                String sq = " ";
+                sq = getConditionJXS(filed[i], fileCondition[i], Arrays.asList(data.get(i)));
+                sql.add(sq);
+            }
+        }
+        return sql;
+    }
+
+    private UserEmpower getTargetDataAuthAnnotationCount(String id) throws ClassNotFoundException {
+
+        if (ValidationUtil.isEmpty(getTargetDataAuthMethodCount(id))) {
+            return  null;
+        }
+        return getTargetDataAuthMethodCount(id).getAnnotation(UserEmpower.class);
+    }
+
+
+
+
+    private String getlikeData(  String filed,List<String> data){
+        String sql="";
+        if(data.size()==1){
+
+            sql= sql+filed+" = "+"%"+data.get(0)+"%";
+        }else {
+            for (int i = 0; i < data.size(); i++) {
+                if (i == data.size() - 1) {
+                    sql = sql + filed + " = " + "%"+data.get(i)+"%" +" ";
+                } else {
+                    sql = sql + filed + " = " + "%"+data.get(i)+"%" +"  and  ";
+                }
+            }
+        }
+
+        return sql;
+    }
+
+    private boolean isCountQuery(String sql) {
+        // 判断 SQL 是否为 COUNT 查询
+        boolean flag = sql.startsWith("SELECT count(");
+        return flag;
+    }
+
+
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerThreadLocal.java

-package com.yeejoin.amos.boot.module.hygf.api.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: tw
- * @createDate: 2023/11/9
- */
-public class UserEmpowerThreadLocal {
-        private static final Logger logger = LoggerFactory.getLogger(com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext.class);
-
-        private static ThreadLocal<UserEmpowerThreadLocalModel> requestContext = ThreadLocal.withInitial(UserEmpowerThreadLocalModel::new);
-
-        private static UserEmpowerThreadLocalModel getPermissionInterceptorContext() {
-            return requestContext.get();
-        }
-
-        public static List<String> getDataAuthRule() {
-            return getPermissionInterceptorContext().getThreadLocalData();
-        }
-
-        public static void setDataAuthRule(List<String> dataAuthRule) {
-            getPermissionInterceptorContext().setDataAuthRule(dataAuthRule);
-        }
-
-        public static void clean() {
-            if (requestContext != null) {
-                requestContext.remove();
-            }
-        }
-    }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerThreadLocalModel.java

-package com.yeejoin.amos.boot.module.hygf.api.config;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @description:
- * @author: tw
- * @createDate: 2023/11/9
- */
-public class UserEmpowerThreadLocalModel implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private List<String> threadLocalData;
-
-    public List<String> getThreadLocalData() {
-        return threadLocalData;
-    }
-
-    public void setDataAuthRule(List<String> threadLocalData) {
-        this.threadLocalData = threadLocalData;
-    }
-
-    public void clean() {
-        this.threadLocalData = null;
-    }
-
-}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserLimitsAdvice.java

 package com.yeejoin.amos.boot.module.hygf.api.config;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UserEmpowerMapper;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -13,20 +26,35 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @description:
  * @author: tw
  * @createDate: 2023/11/9
  */
 @Aspect
-@Order(-1)// 保证该AOP在@Transactional之前执行
+@Order(0)// 保证该AOP在@Transactional之前执行
 @Component
 @Slf4j
 public class UserLimitsAdvice {
 
     @Autowired
     private UserEmpowerMapper userEmpowerMapper;
+    @Autowired
+    PersonnelBusinessMapper personnelBusinessMapper;
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
+    @Autowired
+    private RedisUtils redisUtils;
+
+    private static final String ROLEFLAG="-经销商-";
+
+    private static final String FARMER="-农户";
+    private static final String ROLEFLAGADMIN="-经销商-管理员";
 
+    private static final String ROLEFLDEVELOP="-经销商-开发";
 
     //调用的方法有该注解才会拦截
     @Pointcut("@annotation(com.yeejoin.amos.boot.module.hygf.api.config.UserLimits)")
@@ -38,17 +66,57 @@ public class UserLimitsAdvice {
     @Around("annotationPointCut()")
     public Object annotationAround(ProceedingJoinPoint joinPoint) throws Throwable {
         //获取方法
-//        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        String userid=RequestContext.getExeUserId();
+        StdUserEmpower stdUserEmpower=new StdUserEmpower();
+        ReginParams reginParams=  JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        //判断是否经销商，经销商跟管理端互斥
+        String org= reginParams.getUserModel().getOrgNames();
+        if(org.contains(ROLEFLAG)){
+           UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userid);
+            stdUserEmpower.setFlag(false);
+            stdUserEmpower.setDeveloperId(userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():null);
+            stdUserEmpower.setRegionalCompaniesCode(userUnitInformationDto!=null?userUnitInformationDto.getRegionalCompaniesCode():null);
+            stdUserEmpower.setAmosOrgCode(Arrays.asList(userUnitInformationDto.getAmosUnitOrgCode()));
+            int num = StringUtils.countMatches(org, ROLEFLAG);
+            if (org.contains(ROLEFLDEVELOP)  && num<2 ){
+                stdUserEmpower.setUserId(userid);
+            }
+            else if  (org.contains(ROLEFLAGADMIN)){
+                LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(RegionalCompanies::getUnitInfoId,userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():null);
+                queryWrapper.eq(BaseEntity::getIsDelete,0);
+                List<RegionalCompanies> regionalCompanies = regionalCompaniesMapper.selectList(queryWrapper);
+                if (CollectionUtils.isNotEmpty(regionalCompanies)){
+                    List<String> regionalCompaniesCodes = regionalCompanies.stream().map(RegionalCompanies::getRegionalCompaniesCode).collect(Collectors.toList());
+                    stdUserEmpower.setAdminRegionalCompaniesCode(String.join(",",regionalCompaniesCodes));
+                }
+            } else {
+                stdUserEmpower.setAdminRegionalCompaniesCode(stdUserEmpower.getRegionalCompaniesCode());
 
-        // 获取该方法上的 OpenApi注解
-//        UserLimits aspectAnnotation = method.getAnnotation(UserLimits.class);
+            }
+        }else if(org.contains(FARMER)){
+             //农户暂不做需求
+            stdUserEmpower.setFarmer(true);
+
+
+        }else{
+            LambdaQueryWrapper<StdUserEmpower> qu=new LambdaQueryWrapper();
+            qu.eq(StdUserEmpower::getAmosUserId,userid);
+            qu.eq(StdUserEmpower::getPermissionType,"HYGF");
+            stdUserEmpower= userEmpowerMapper.selectOne(qu);
+            if(stdUserEmpower==null){
+                stdUserEmpower=new StdUserEmpower();
+            }
+            stdUserEmpower.setFlag(true);
+            //获取外部不选数据
+            List<Map<String,String>> lis=userEmpowerMapper.georgcodelist(stdUserEmpower.getEliminateAmosOrgCode());
+            stdUserEmpower.setNOeliminateAmosOrgCode(lis!=null?lis.stream().map(t -> t.get("orgCode").toString()).collect(Collectors.toList()):null);
+        }
+       // UserEmpowerThreadLocal.setDataAuthRule(stdUserEmpower!=null?stdUserEmpower:null);
+
+
+        redisUtils.set("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()),stdUserEmpower!=null?stdUserEmpower:null);
 
-        String userid=RequestContext.getExeUserId();
-        LambdaQueryWrapper<StdUserEmpower> qu=new LambdaQueryWrapper();
-        qu.eq(StdUserEmpower::getAmosUserId,userid);
-        qu.ne(StdUserEmpower::getPermissionType,"YTH");
-        StdUserEmpower list= userEmpowerMapper.selectOne(qu);
-        UserEmpowerThreadLocal.setDataAuthRule(list!=null?list.getAmosOrgCode():null);
         //正常往后执行
         return joinPoint.proceed();
     }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 投融审核表
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FinancingAuditingDto", description="投融审核表")
+public class FinancingAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FinancingInfoDto", description="")
+public class FinancingInfoDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "所属融资公司id")
+    private Long financingCompaniesSeq;
+
+    @ApiModelProperty(value = "所属融资公司名称")
+    private String financingCompaniesName;
+
+    @ApiModelProperty(value = "所属融资公司code")
+    private String financingCompaniesCode;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "放款时间")
+    private Date disbursementTime;
+
+    @ApiModelProperty(value = "元")
+    private Double disbursementMoney;
+
+    @ApiModelProperty(value = "附件")
+    private String file;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+}

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

@@ -142,4 +142,6 @@ public class HYGFMaintenanceTicketsDto extends BaseDto {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date taskEndTime;
+    //创建人id
+    private String creatorUserId;
 }

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 
@@ -18,10 +19,10 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="MaintenanceDto", description="运维人员")
-public class MaintenanceDto  extends BaseDto {
+@ApiModel(value = "MaintenanceDto", description = "运维人员")
+public class MaintenanceDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "运维人员类型名称")
@@ -130,9 +131,8 @@ public class MaintenanceDto  extends BaseDto {
     private String permanentAddressName;
 
     /**
-     *
      * 基础人员表
-     * */
+     */
     private Long foundationId;
 
 
@@ -141,12 +141,21 @@ public class MaintenanceDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "身份证正面")
-    private  List<Object> idCardFrontList;
+    private List<Object> idCardFrontList;
 
     @ApiModelProperty(value = "身份证反面")
-    private  List<Object> idCardOppositeList;
+    private List<Object> idCardOppositeList;
 
     @ApiModelProperty(value = "是否签订安全协议")
-    private  Integer  isSignAnAgreement ;
+    private Integer isSignAnAgreement;
+
+    @ApiModelProperty(value = "审核意见")
+    private String notes;
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operationTime;
 
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PreparationDto {
+    String orderBy;
+    Boolean isASC;
+
+
+    String consigneeRegion;//订单区域
+    String amosUnitId;//经销商
+    String amosUnitName;//经销商
+    String oddNumbers;//发货单号
+    String regionalCompaniesCode;
+
+    String arrivalState;//收货
+    String deliveryState;//发货状态  未发货已发货
+    List<String> deliveryTime;
+    String deliveryTimeStart;
+    String deliveryTimeEnd;
+    String flag ;
+}

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

@@ -26,6 +26,8 @@ public class PreparationPageDto extends Page<PreparationMoney> {
     String arrivalState;//收货
     String deliveryState;//发货状态  未发货已发货
     List<String> deliveryTime;
+    String deliveryTimeStart;
+    String deliveryTimeEnd;
     String flag ;
 
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -221,4 +222,6 @@ public class TdHygfJpInverterWarnDto {
 
 	private Long sequenceNbr;
 
+	private String ticketStatus ;
+	private List<HYGFMaintenanceTickets> listTickets;
 }

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

@@ -38,4 +38,8 @@ public class UserUnitInformationDto {
 
     @ApiModelProperty(value = "经销商单位id")
     private Long  amosUnitInfoId;
+
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/FinancingAuditing.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 投融审核表
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_financing_auditing")
+public class FinancingAuditing extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作流实例ID
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 下一个节点角色权限
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 流程下一节点id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 工作流发起人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 下个节点名称
+     */
+	@TableField("next_node_name")
+    private String nextNodeName;
+
+    /**
+     * 下个节点key
+     */
+	@TableField("next_node_key")
+    private String nextNodeKey;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+    //" 待执行节点小程序路由"
+    @TableField("node_routing")
+    private String nodeRouting;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/FinancingInfo.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_financing_info")
+public class FinancingInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属融资公司id
+     */
+	@TableField("financing_companies_seq")
+    private Long financingCompaniesSeq;
+
+    /**
+     * 所属融资公司名称
+     */
+	@TableField("financing_companies_name")
+    private String financingCompaniesName;
+
+    /**
+     * 所属融资公司code
+     */
+	@TableField("financing_companies_code")
+    private String financingCompaniesCode;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     * 放款时间
+     */
+	@TableField("disbursement_time")
+    private Date disbursementTime;
+
+    /**
+     * 元
+     */
+	@TableField("disbursement_money")
+    private Double disbursementMoney;
+
+    /**
+     * 附件
+     */
+	@TableField("file")
+    private String file;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HYGFMaintenanceTickets.java

@@ -168,4 +168,8 @@ public class HYGFMaintenanceTickets extends BaseEntity {
 
     @TableField("score")
     private String score ;
+    //创建人id
+    @TableField("creator_user_id")
+    private String creatorUserId;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java

@@ -194,4 +194,13 @@ public class PeasantHousehold extends BaseEntity {
      */
     @TableField("construction_state")
     private String constructionState;
+
+    @TableField(exist = false)
+    private String surveyOrNotText;
+
+    @TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
+    private List<String> permanentAddressText;
+
+    @TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
+    private List<String> projectAddressText;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/StdUserEmpower.java

@@ -38,5 +38,44 @@ public class StdUserEmpower extends BaseEntity {
     @TableField("permission_type")
     private String permissionType;
 
+    /**
+     * 外部选中单位orgcode
+     */
+    @TableField(value = "eliminate_amos_org_code",typeHandler = FastjsonTypeHandler.class)
+    private List<String> eliminateAmosOrgCode;
+
+
+    /**
+     * 外部 不选中单位orgcode
+     */
+    @TableField(exist = false)
+    private List<String> NOeliminateAmosOrgCode;
+
+
+
+    //登录人id
+    @TableField(exist = false)
+    private String userId;
+
+    //区域公司orgcode
+    @TableField(exist = false)
+    private String regionalCompaniesCode;
+
+    //经销商业务单位id
+    @TableField(exist = false)
+    private Long developerId;
+
+
+    //管理端 true，还是经销商false
+    @TableField(exist = false)
+    private boolean flag;
+
+    //经销商管理员区域公司orgcode
+    @TableField(exist = false)
+    private String adminRegionalCompaniesCode;
+
 
+    //是否农户
+    @TableField(exist = false)
+    private boolean farmer;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +17,7 @@ public interface AcceptanceMapper extends BaseMapper<BaseEntity> {
      * @param acceptanceDto 查询参数
      * @return 分页结果
      */
+    @UserEmpower(field = {"ph.regional_companies_code"}, dealerField={"ph.developer_code","ph.regional_companies_code","ph.developer_user_id"},fieldConditions = {"in","in","in"}, relationship = "and")
     List<AcceptanceDto> page(
 
             @Param("param") AcceptanceDto acceptanceDto

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BasicGridAcceptanceMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -19,6 +20,6 @@ public interface BasicGridAcceptanceMapper extends BaseMapper<BasicGridAcceptanc
 
 
     PeasantHousehold getStationInfoById(@Param("id") Long id);
-
+    @UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
     List<BasicGridAcceptanceDto> selectPageList(@Param("map") Map<String, Object> map);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/DealerReviewMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
 
@@ -12,6 +13,6 @@ import java.util.List;
  * @createDate: 2023/8/1
  */
 public interface DealerReviewMapper extends BaseMapper<DealerReview> {
-
+//    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<ReviewDto> queryForDealerReviewPage(ReviewDto reviewDto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/FileInformationMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.entity.FileInformation;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 业务文件 Mapper 接口
  *
@@ -11,4 +14,6 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FileInformation;
  */
 public interface FileInformationMapper extends BaseMapper<FileInformation> {
 
+  List<Map<String,String>> getStationInfoList();
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/FinancingAuditingMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingAuditing;
+
+/**
+ * 投融审核表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+public interface FinancingAuditingMapper extends BaseMapper<FinancingAuditing> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/FinancingInfoMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+public interface FinancingInfoMapper extends BaseMapper<FinancingInfo> {
+
+   List<Map<String,String>> getStationFinancingInfoList();
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HYGFMaintenanceTicketsMapper.java

@@ -14,5 +14,7 @@ public interface HYGFMaintenanceTicketsMapper extends BaseMapper<HYGFMaintenance
     List<String> queryInverterSncodesByStationId(String stationId);
     @Update("update hygf_maintenance_tickets SET score = #{score} WHERE sequence_nbr = #{sequenceNbr}")
     void updateScoreBySequenceNbr(String score,Long sequenceNbr);
-    List<HYGFMaintenanceTicketsDto> qureyListByQueryparams(@Param("dto") HYGFMaintenanceTicketsDto dto );
+    List<HYGFMaintenanceTicketsDto> qureyListByQueryparams(@Param("dto") HYGFMaintenanceTicketsDto dto ,@Param("amosUserId")String amosUserId);
+
+    List<HYGFMaintenanceTicketsDto> queryForPageList(@Param("dto") HYGFMaintenanceTicketsDto dto ,@Param("amosUserId")String amosUserId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HouseholdContractMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
+import org.apache.ibatis.annotations.Param;
 
 /**
  *  Mapper 接口
@@ -11,4 +17,6 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
  */
 public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
 
+    @UserEmpower(field ={"hygf_household_contract.regional_companies_code"} ,dealerField={"dealer_code","hygf_household_contract.regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
+    IPage<HouseholdContract> selectPage(@Param("dto") HouseholdContractPageDto dto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpCollectorMapper.java

@@ -20,9 +20,9 @@ public interface JpCollectorMapper extends BaseMapper<JpCollector> {
    List<Map<String,Object>>  queryCollectorCountStatus(@Param("dto") JpStationDto reviewDto);
 
 
-   @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+   @UserEmpower(field ={"sta.regional_companies_code"} ,dealerField = {"sta.amos_company_code","sta.regional_companies_code"},fieldConditions ={"in","in"} ,relationship="and")
    List<JpCollectorDto>  selectPageData(@Param("dto") JpCollectorDto reviewDto, Integer current, Integer size);
 
-   @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+   @UserEmpower(field ={"sta.regional_companies_code"} ,dealerField = {"sta.amos_company_code","sta.regional_companies_code"},fieldConditions ={"in","in"} ,relationship="and")
    int  selectPageDataTota(@Param("dto") JpCollectorDto reviewDto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpInverterMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.DealerRestrict;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDtoNew;
@@ -21,9 +22,10 @@ public interface JpInverterMapper extends BaseMapper<JpInverter> {
 
     List<Map<String,Object>> queryInverterCountStatus(@Param("dto") JpStationDto reviewDto);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"sta.regional_companies_code"} ,dealerField={"sta.amos_company_code","sta.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+   // @DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
     List<JpInverterDtoNew> selectPageData(@Param("dto") JpInverterDto reviewDto, int current, int size);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"sta.regional_companies_code"} ,dealerField={"sta.amos_company_code","sta.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     int  selectPageDataTotal(@Param("dto") JpInverterDto reviewDto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.config.DealerRestrict;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DropDown;
@@ -24,39 +25,42 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     List<Map<String,Object>>  countState(@Param("dto") JpStationDto reviewDto);
     List<Map<String,Double>> getPowerqx(String dateType);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    //@DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","in"} ,relationship="and")
+    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<JpStation> getJpStation(@Param("dto") JpStationDto reviewDto);
 
     List<JpStation> getJpStationList(@Param("dto") JpStationDto reviewDto);
 
-    @UserEmpower(field ={"ORG_CODE"} ,fieldConditions ={"in"} ,relationship="")
+    @UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"in","in"} ,relationship="and",specific=false)
     List<DropDown>  getRegion();
 
-    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code","hygf_unit_info.amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    List<DropDown>  getRegionAll();
+
+    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<DropDown>  getDealer(@Param("regionalCompaniesCode") String regionalCompaniesCode);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    List<DropDown>  getDealerAll(@Param("regionalCompaniesCode") String regionalCompaniesCode);
+
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     JpStationDto getCountJpStationdata(@Param("dto") JpStationDto reviewDto);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<Map<String,Object>>  getcountState(@Param("dto") JpStationDto reviewDto);
     //投产电站数
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     Map<String,Object>getcountStatetc(@Param("dto") JpStationDto reviewDto);
     //建设建站数
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     Map<String,Object>getcountStatejs(@Param("dto") JpStationDto reviewDto);
     //接入中电站数
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     Map<String,Object>getcountStatejr(@Param("dto") JpStationDto reviewDto);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     Map<String,Object> getcount( @Param("dto") JpStationDto reviewDto);
 
-    @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
-    @UserLimits
-    List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto, Page<JpStationDto> pa);
-
+    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+   List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto);
 
     List<DropDown>  getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,10 +32,12 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
     public Integer selectMaintenance(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
 
     //列表
+   // @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
                                          @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
                                          @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,
-                                         @Param("maintenanceAreaAddress")String maintenanceAreaAddress);
+                                         @Param("maintenanceAreaAddress")String maintenanceAreaAddress,
+                                         @Param("regionalCompaniesCode")String regionalCompaniesCode, @Param("dealerCode") String dealerCode);
 
 
     //详情

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +29,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
                                                         @Param("ids")String ids
 
     );
+    @UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
+    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PersonnelBusinessMapper.java

@@ -2,9 +2,11 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDtoUserDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -21,7 +23,6 @@ public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
     Map<String,String> getorgcode(@Param("id")Long id);
 
     //根据平台userid  获取人员所属经销商
-
     UserUnitInformationDto getUserUnitInformationDto(@Param("userId")String userId);
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
 import org.apache.ibatis.annotations.Param;
@@ -14,6 +16,7 @@ import java.util.List;
  * @date 2023-07-15
  */
 public interface PowerStationMapper extends BaseMapper<PowerStation> {
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"a.developer_code","a.regional_companies_code","a.developer_user_id"} ,fieldConditions ={"in","in","in"}, relationship="and")
     List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
                                     @Param("ownersName")String ownersName,
                                     @Param("serviceAgent")String serviceAgent);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +25,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
 
     List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr")  Long sequenceNbr,@Param("ownersName")  String ownersName);
 
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<PreparationMoney> selectPageList(@Param(value = "dto") PreparationDto preparationDto);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RegionalCompaniesMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,4 +19,7 @@ public interface RegionalCompaniesMapper extends BaseMapper<RegionalCompanies> {
     RegionalCompanies selectByid(@Param("sequenceNbr")Long sequenceNbr);
 
     RegionalCompanies selectRegionName(@Param("sequenceNbr")Long sequenceNbr);
+
+    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"},fieldConditions ={"eq","in"} ,relationship="and")
+    List<RegionalCompanies>  selectListRegionalCompanies(@Param("sequenceNbr")Long sequenceNbr);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import org.apache.ibatis.annotations.Param;
@@ -23,5 +26,9 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
     List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
     List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
+    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
+    List<UnitInfo>   getlistUnitInfo();
+//    @UserEmpower(field ={"hygf_unit_info.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
+//     UnitInfo  selectById( Long unitInfoId);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UserEmpowerMapper.java

@@ -2,6 +2,10 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -10,4 +14,14 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
 
+    List<Map<String,String>>  georgcodelist(@Param("orgs") List<String> orgs );
+
+    void upuserrole(
+            @Param("id") Long id,
+            @Param("userId") String userId,
+            @Param("role") Long role,
+            @Param("com") Long com
+
+    );
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
 import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +15,9 @@ import java.util.List;
  * @date 2024-01-02
  */
 public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+    @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code"}, fieldConditions = {"eq", "in", }, relationship = "and")
     List<WorkOrder> selectWorkOrderList(@Param("dto") WorkOrder dto);
+    @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<WorkOrderPage> queryForwgpage(@Param("dto") WorkOrderPage dto);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IFinancingAuditingService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 投融审核表接口类
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+public interface IFinancingAuditingService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IFinancingInfoService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+public interface IFinancingInfoService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/json/DealerRestrict.json

+[
+  {
+    "key": "manage",
+    "roleIds": ""
+  },
+  {
+    "key": "develop",
+    "roleIds": "1742437975800705025"
+  },
+  {
+    "key": "other",
+    "roleIds": ""
+  }
+]
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -13,6 +13,7 @@
     </select>
 
     <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
+
         SELECT
         hogaa.sequence_nbr fonGridId,
         hbga.sequence_nbr sequenceNbr,
@@ -26,14 +27,13 @@
         hph.developer_name as serviceAgent,
         hph.regional_companies_name AS regionalCompaniesName,
         hph.owners_name AS ownersName,
-            hph.peasant_household_no peasantHouseholdNo,
-            hph.project_address_name projectAddressName,
-            DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
-            CASE WHEN hbga.grid_status = '1' THEN '待登记'
-                WHEN hbga.grid_status = '2' THEN '待审核'
-                WHEN hbga.grid_status = '3' THEN '已完成'
-                ELSE '未通过' END AS gridStatus
-
+        hph.peasant_household_no peasantHouseholdNo,
+        hph.project_address_name projectAddressName,
+        DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
+        CASE WHEN hbga.grid_status = '1' THEN '待登记'
+        WHEN hbga.grid_status = '2' THEN '待审核'
+        WHEN hbga.grid_status = '3' THEN '已完成'
+        ELSE '未通过' END AS gridStatus
         FROM
             hygf_basic_grid_acceptance hbga
             LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
@@ -70,5 +70,7 @@
         ORDER BY
         FIELD(hbga.grid_status, '1', '2', '4', '3'),
          hogaa.grid_connection_time desc
+
+
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/DealerReviewMapper.xml

@@ -33,7 +33,9 @@
         d.plan_instance_id planInstanceId,
         u.admin_user_id  adminUserId,
         (select GROUP_CONCAT(hygf_regional_companies.regional_companies_name) from hygf_regional_companies where hygf_regional_companies.unit_info_id=u.sequence_nbr ) regionalCompaniesName
-        from  hygf_commerce_info c  LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
+        from  hygf_commerce_info c
+        LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr
+        LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
         <where>
             u.is_delete=0
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingAuditingMapper.xml

+<?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.yeejoin.amos.boot.module.jxiop.api.mapper.FinancingAuditingMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoMapper.xml

+<?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.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper">
+
+
+    <select id="getStationFinancingInfoList" resultType="java.util.Map">
+        SELECT
+            hph.sequence_nbr AS sequenceNbr,
+            hph.peasant_household_no peasantHouseholdNo,
+            hph.owners_name as ownersName,
+            hph.project_address as projectAddress,
+            hph.regional_companies_name as regionalCompaniesName,
+            IFNULL(info.`status`,'待推送') as status
+        FROM
+            `hygf_peasant_household`  hph Left JOIN hygf_financing_info info on info.peasant_household_id = hph.sequence_nbr
+        WHERE
+            hph.construction_state= '验收完成'
+    </select>
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HYGFMaintenanceTicketsMapper.xml

@@ -5,17 +5,40 @@
 
     <select id="qureyListByQueryparams"
             resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto">
-        select * from
+        select hygf_maintenance_tickets.* from
         hygf_maintenance_tickets
+        left join
+        hygf_maintenance on hygf_maintenance_tickets.maintenance_person_id = hygf_maintenance.sequence_nbr
+        LEFT JOIN
+        std_user_biz on hygf_maintenance.foundation_id = std_user_biz.sequence_nbr
         <where>
-            is_delete = 0
+            std_user_biz.amos_user_id =#{amosUserId}
+            and hygf_maintenance_tickets.is_delete = 0
             <if test="dto.handlerStatus != null and dto.handlerStatus !=''">
-                And handler_status = #{dto.handlerStatus}
+                And hygf_maintenance_tickets.handler_status = #{dto.handlerStatus}
             </if>
             <if test="dto.stationName != null and dto.stationName !=''">
-                And station_name LIKE CONCAT('%', #{dto.stationName}, '%')
+                And hygf_maintenance_tickets.station_name LIKE CONCAT('%', #{dto.stationName}, '%')
             </if>
         </where>
-        order by sequence_nbr desc
+        order by hygf_maintenance_tickets.sequence_nbr desc
+    </select>
+
+
+    <select id="queryForPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto">
+        select hygf_maintenance_tickets.* from
+        hygf_maintenance_tickets
+
+        <where>
+            hygf_maintenance_tickets.creator_user_id =#{amosUserId}
+            and hygf_maintenance_tickets.warning_id =0
+            <if test="dto.handlerStatus != null and dto.handlerStatus !=''">
+                And hygf_maintenance_tickets.handler_status = #{dto.handlerStatus}
+            </if>
+            <if test="dto.stationName != null and dto.stationName !=''">
+                And hygf_maintenance_tickets.station_name LIKE CONCAT('%', #{dto.stationName}, '%')
+            </if>
+        </where>
+        order by hygf_maintenance_tickets.sequence_nbr desc
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml

@@ -2,4 +2,45 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper">
 
+    <select id="selectPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract">
+
+    select
+           *
+    from hygf_household_contract
+        LEFT JOIN   hygf_peasant_household  php   ON  php.sequence_nbr = hygf_household_contract.peasant_household_id     <where>
+    <if test="dto.name != null and dto.name !='' ">
+        and hygf_household_contract.name like concat('%',#{dto.name},'%')
+    </if>
+    <if test="dto.contractNumber != null  and dto.contractNumber !=''">
+        and hygf_household_contract.contract_number like concat('%',#{dto.contractNumber},'%')
+    </if>
+    <if test="dto.initiateStatus != null and dto.initiateStatus !='' ">
+        and hygf_household_contract.initiate_status = #{dto.initiateStatus}
+    </if>
+    <if test="dto.peasantHouseholdId != null and dto.peasantHouseholdId !=''">
+        and hygf_household_contract.peasant_household_id = #{dto.peasantHouseholdId}
+    </if>
+    <if test="dto.dealerId != null and dto.dealerId !=''">
+        and hygf_household_contract.dealer_id = #{dto.dealerId}
+    </if>
+    <if test="dto.surveyStatus != null and dto.surveyStatus !=''">
+        and hygf_household_contract.survey_status = #{dto.surveyStatus}
+    </if>
+    <if test="dto.signStatus != null and dto.signStatus !=''">
+        and hygf_household_contract.sign_status = #{dto.signStatus}
+    </if>
+    <if test="dto.userId != null and dto.userId !=''">
+        and hygf_household_contract.project_user_id = #{dto.userId}
+    </if>
+    <if test="dto.partyA != null and dto.partyA !=''">
+        and hygf_household_contract.party_a like concat('%',#{dto.partyA},'%')
+    </if>
+    </where>
+        <if test="dto.orderBy  == null ">
+            ORDER BY hygf_household_contract.rec_date DESC
+        </if>
+        <if test="dto.orderBy != null ">
+            ORDER BY hygf_household_contract.${orderBy} ${dto.isAsc}
+        </if>
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml

@@ -76,7 +76,7 @@
         from
         hygf_jp_inverter  hjc
         left join hygf_jp_station sta on sta.third_station_id = hjc.third_station_id
-        <where>
+      <where>
             <if test="dto.snCode != null and dto.snCode != ''">
                 AND  hjc.sn_code like #{dto.snCode}
             </if>
@@ -96,6 +96,7 @@
         from
         hygf_jp_inverter  hjc
         left join hygf_jp_station sta on sta.third_station_id = hjc.third_station_id
+
         <where>
             <if test="dto.snCode != null and dto.snCode != ''">
                 AND  hjc.sn_code like #{dto.snCode}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -163,8 +163,7 @@
         select
         *
         from hygf_jp_station
-
-        <where>
+            <where>
             is_delete=0
             <if test="dto.name!=null">
                 and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
@@ -247,6 +246,12 @@
         FROM  privilege_company
         WHERE  IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
     </select>
+    <select id="getRegionAll"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
+        SELECT  privilege_company.ORG_CODE orgCode ,
+        privilege_company.COMPANY_NAME  name
+        FROM  privilege_company
+        WHERE  IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
+    </select>
 
     <select id="getDealer"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
       SELECT  hygf_unit_info.`name`,  hygf_unit_info.amos_company_code  orgCode   FROM hygf_regional_companies LEFT JOIN hygf_unit_info
@@ -259,6 +264,17 @@
       GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
     </select>
 
+    <select id="getDealerAll"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
+        SELECT  hygf_unit_info.`name`,  hygf_unit_info.amos_company_code  orgCode   FROM hygf_regional_companies LEFT JOIN hygf_unit_info
+        ON hygf_unit_info.sequence_nbr=hygf_regional_companies.unit_info_id  WHERE hygf_unit_info.audit_status='2'
+        AND hygf_unit_info.blacklist='0' AND hygf_unit_info.is_delete='0'
+        <if test="regionalCompaniesCode!=null">
+            and hygf_regional_companies.regional_companies_code =#{regionalCompaniesCode}
+        </if>
+        and hygf_unit_info.amos_company_code is not null
+        GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
+    </select>
+
     <select id="getDealerNew"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
         SELECT  hygf_unit_info.`name`,  hygf_unit_info.sequence_nbr  orgCode
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.xml

@@ -53,9 +53,8 @@
         std_user_biz.id_card_opposite    idCardOpposite,
         std_user_biz.amos_org_code   amosDealerCode,
         std_user_biz.amos_id    amosDealerId
-
         from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
-
+        LEFT JOIN hygf_unit_info on hygf_unit_info.sequence_nbr = ph.dealer_id
         <where>
             ph.is_delete = 0
 
@@ -78,17 +77,21 @@
             <if test="reviewStatus != null and reviewStatus != ''">
                 AND ph.review_status = #{reviewStatus}
             </if>
-
             <if test="regionalCompaniesSeq != null and regionalCompaniesSeq != ''">
                 AND ph.regional_companies_seq = #{regionalCompaniesSeq}
             </if>
+            <if test="regionalCompaniesCode != null and regionalCompaniesCode != ''">
+                AND ph.regional_companies_code = #{regionalCompaniesCode}
+            </if>
             <if test="dealerId != null and dealerId != ''">
                 AND ph.dealer_id = #{dealerId}
             </if>
+            <if test="dealerCode != null and dealerCode != ''">
+                AND hygf_unit_info.amos_company_code = #{dealerCode}
+            </if>
 
         </where>
-
-
+        order by ph.rec_date desc
     </select>
 
 
@@ -158,7 +161,7 @@
 
         <where>
             ph.is_delete = 0 and ph.review_status='通过' and  ph.training_status='已培训'  and  ph.is_sign_an_agreement=0
-
+            and std_user_biz.lock_status = 'UNLOCK'
 
             <if test="maintenanceType != null and maintenanceType != ''">
                 AND ph.maintenance_type = #{maintenanceType}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -33,7 +33,7 @@ and hygf_document_station.station_id is not null
         hygf_peasant_household.sequence_nbr stationId
         FROM  hygf_peasant_household
         where
-        hygf_peasant_household.construction_state='已收货'
+        hygf_peasant_household.construction_state='备货完成'
         and hygf_peasant_household.developer_id=#{developerId}
         and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
         and hygf_peasant_household.sequence_nbr not in (
@@ -51,5 +51,20 @@ and hygf_document_station.station_id is not null
         </if>
 
     </select>
+    <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
+        SELECT *
+        FROM hygf_peasant_household
+        WHERE IS_CERTIFIED = #{isCertified}
+        <if test="ownersName!=null and ownersName !=''">
+            and owners_name like concat ('%',#{ownersName},'%')
+        </if>
+        <if test="developerId!=null and developerId !=''">
+            and developer_id = #{developerId}
+        </if>
+        <if test="developerCode!=null and developerCode !=''">
+            and developer_code = #{developerCode}
+        </if>
+        ORDER BY rec_date DESC
+    </select>
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml

@@ -36,7 +36,7 @@
             and std_user_biz.lock_status=#{dto.lockStatus}
         </if>
         <if test="dto.amosUserName!=null">
-            and std_user_biz.amos_user_name=#{dto.amosUserName}
+            and std_user_biz.amos_user_name  like concat(concat("%",#{dto.amosUserName}),"%")
         </if>
         <if test="dto.amosUnitOrgCode!=null">
             and hygf_personnel_business.amos_unit_org_code like concat(concat(#{dto.amosUnitOrgCode}),"%")

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -5,9 +5,13 @@
     select * from (select
     hygf_power_station.*,
     b.initiate_status,
-    b.contract_lock_id
+    b.contract_lock_id,
+    hygf_peasant_household.regional_companies_code,
+    hygf_peasant_household.developer_code,
+    hygf_peasant_household.developer_user_id
     from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from  hygf_household_contract where   hygf_household_contract.status !='已作废'
     ) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
+    LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_power_station.peasant_household_id
     where hygf_power_station.is_delete=0
 
     <if test="powerStationCode!=null and powerStationCode!=''">

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -11,4 +11,32 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
      </if>
 
 </select>
+
+    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
+        SELECT * FROM hygf_preparation_money
+        <where>
+            <if test="dto.consigneeRegion != null and dto.consigneeRegion != ''">
+                and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%')
+            </if>
+            <if test="dto.amosUnitName != null and dto.amosUnitName != ''">
+                and hygf_preparation_money.amos_unit_name like concat ('%',#{dto.amosUnitName},'%')
+            </if>
+            <if test="dto.oddNumbers != null and dto.oddNumbers != ''">
+                and hygf_preparation_money.odd_numbers = #{dto.oddNumbers}
+            </if>
+            <if test="dto.deliveryState != null and dto.deliveryState != ''">
+                and hygf_preparation_money.delivery_state = #{dto.deliveryState}
+            </if>
+            <if test="dto.amosUnitId != null and dto.amosUnitId != ''">
+                and hygf_preparation_money.amos_unit_id = #{dto.amosUnitId}
+            </if>
+            <if test="dto.flag != null and dto.flag != ''">
+                and hygf_preparation_money.delivery_state != "已作废"
+            </if>
+            <if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''">
+                and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}
+            </if>
+        </where>
+        ORDER BY order_time DESC
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RegionalCompaniesMapper.xml

@@ -86,4 +86,14 @@
         from privilege_company where privilege_company.SEQUENCE_NBR=#{sequenceNbr}
 
     </select>
+
+
+
+    <select id="selectListRegionalCompanies" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
+
+select * from   hygf_regional_companies
+    Left JOIN  hygf_unit_info on hygf_unit_info.sequence_nbr = hygf_regional_companies.unit_info_id
+where hygf_regional_companies.is_delete=0
+ and  hygf_regional_companies.unit_info_id=#{sequenceNbr}
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml

@@ -90,4 +90,13 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
     </select>
 
 
+    <select id="getlistUnitInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo">
+
+    select  hygf_unit_info.* from hygf_unit_info left
+    JOIN  hygf_regional_companies on  hygf_regional_companies.unit_info_id=hygf_unit_info.sequence_nbr
+    where hygf_unit_info.is_delete=0 and hygf_unit_info.audit_status=2
+    GROUP BY hygf_unit_info.sequence_nbr
+
+    </select>
+
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UserEmpowerMapper.xml

+<?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.yeejoin.amos.boot.module.hygf.api.mapper.UserEmpowerMapper">
+
+    <select id="georgcodelist" resultType="Map">
+
+        select ORG_CODE orgCode from privilege_company where  COMPANY_TYPE='region' and LEVEL='outer_company'
+
+        <if test="orgs != null and orgs.size() >0">
+            and  ORG_CODE not in
+            <foreach collection="orgs" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+    </select>
+<insert id="upuserrole">
+
+INSERT INTO `amos_project`.`privilege_user_org_role` ( `SEQUENCE_NBR`, `REC_DATE`, `REC_USER_ID`, `USER_ID`,
+`COMPANY_SEQ`,
+`DEPARTMENT_SEQ`,
+`AGENCY_CODE`,
+ `ROLE_SEQ` )
+VALUES
+	( #{id},
+	sysdate(),
+	#{userId},
+	#{userId},
+	#{com},
+	 null,
+	'JXIOP',
+	#{role} );
+
+</insert>
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -14,8 +14,8 @@
 
        ) peasantHouseholdSgNum
 
-       FROM  hygf_work_order WHERE hygf_work_order.is_delete=0
-
+       FROM  hygf_work_order
+       WHERE hygf_work_order.is_delete=0
        <if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
            and hygf_work_order.work_order_num like concat(concat("%",#{dto.workOrderNum}),"%")
        </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml

@@ -33,12 +33,12 @@
                    #{item}
                </foreach>
 		    </if>
-			<if test="param.listHandlerStatus!=null">
-				AND handler_status IN
-				<foreach collection="param.listHandlerStatus" item="item" index="index" open="(" separator="," close=")">
-					#{item}
-				</foreach>
-			</if>
+<!--			<if test="param.listHandlerStatus!=null">-->
+<!--				AND handler_status IN-->
+<!--				<foreach collection="param.listHandlerStatus" item="item" index="index" open="(" separator="," close=")">-->
+<!--					#{item}-->
+<!--				</foreach>-->
+<!--			</if>-->
 		</where>
 
         order by  start_time DESC
@@ -74,9 +74,9 @@
 			<if test="state != null and state != ''">
 				AND `state` = #{state}
 			</if>
-			<if test="handlerStatus != null and handlerStatus != ''">
-				AND handler_status = #{handlerStatus}
-			</if>
+<!--			<if test="handlerStatus != null and handlerStatus != ''">-->
+<!--				AND handler_status = #{handlerStatus}-->
+<!--			</if>-->
 			<if test="level != null and level != ''">
 				AND `level` = #{level}
 			</if>
@@ -116,11 +116,11 @@
 		FROM house_pv_data.td_hygf_jp_inverter_warn
 		<where>
 			<if test="state != null and state != ''">
-				AND handler_status = #{state}
-			</if>
-			<if test="handlerStatus != null and handlerStatus != ''">
-				AND handler_status = #{handlerStatus}
+				AND `state` = #{state}
 			</if>
+<!--			<if test="handlerStatus != null and handlerStatus != ''">-->
+<!--				AND handler_status = #{handlerStatus}-->
+<!--			</if>-->
 			<if test="level != null and level != ''">
 				AND level = #{level}
 			</if>

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

@@ -70,8 +70,8 @@ public class MysqlServerConfig {
 
 
         bean.setPlugins(new Interceptor[] {interceptor,
-                paginationInterceptor(),
-                userEmpowerInterceptor()
+                userEmpowerInterceptor(),
+                paginationInterceptor()
         });
         return bean.getObject();
     }
@@ -102,4 +102,6 @@ public class MysqlServerConfig {
 
         return userEmpowerInterceptor;
     }
+
+
 }
\ 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/controller/AcceptanceController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -33,16 +34,17 @@ public class AcceptanceController  extends BaseController {
     @PostMapping(value = "/page")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
+    @UserLimits
     public ResponseModel<Page<AcceptanceDto>> page(
             @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
             @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
             @RequestBody AcceptanceDto param
     ) {
-        UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
-        if(userUnitInformationDto!=null){
-            param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
-            param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
-        }
+//        UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
+//        if(userUnitInformationDto!=null){
+//            param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
+//            param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
+//        }
 
 
         return ResponseHelper.buildResponse( acceptanceService.page(current, size, param));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -121,6 +122,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	@UserLimits
 	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForPage(@RequestParam(value = "current") int current,
 																	@RequestParam(value = "size") int size,
 																	@RequestParam(required = false,value = "projectAddress") String projectAddress,
@@ -129,8 +131,8 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
 																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(userUnitInformationDto.getRegionalCompaniesSeq(),userUnitInformationDto.getAmosDealerId(),current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
 	    return ResponseHelper.buildResponse(page);
 	}
 
@@ -144,6 +146,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/check/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    @UserLimits
 	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForCheckPage(@RequestParam(value = "current") int current,
 																	@RequestParam(value = "size") int size,
 																	@RequestParam(required = false,value = "projectAddress") String projectAddress,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingAuditingController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingAuditingServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 投融审核表
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@RestController
+@Api(tags = "投融审核表Api")
+@RequestMapping(value = "/financing-auditing")
+public class FinancingAuditingController extends BaseController {
+
+    @Autowired
+	FinancingAuditingServiceImpl financingAuditingServiceImpl;
+
+    /**
+     * 新增投融审核表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增投融审核表", notes = "新增投融审核表")
+	public ResponseModel<FinancingAuditingDto> save(@RequestBody FinancingAuditingDto model) {
+	    model = financingAuditingServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新投融审核表", notes = "根据sequenceNbr更新投融审核表")
+	public ResponseModel<FinancingAuditingDto> updateBySequenceNbrFinancingAuditing(@RequestBody FinancingAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(financingAuditingServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除投融审核表", notes = "根据sequenceNbr删除投融审核表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(financingAuditingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个投融审核表",  notes = "根据sequenceNbr查询单个投融审核表")
+	public ResponseModel<FinancingAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(financingAuditingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "投融审核表分页查询",  notes = "投融审核表分页查询")
+	public ResponseModel<Page<FinancingAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FinancingAuditingDto> page = new Page<FinancingAuditingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(financingAuditingServiceImpl.queryForFinancingAuditingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "投融审核表列表全部数据查询",   notes = "投融审核表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FinancingAuditingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(financingAuditingServiceImpl.queryForFinancingAuditingList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingInfoController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/financing-info")
+public class FinancingInfoController extends BaseController {
+
+    @Autowired
+    FinancingInfoServiceImpl financingInfoServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<FinancingInfoDto> save(@RequestBody FinancingInfoDto model) {
+	    model = financingInfoServiceImpl.saveModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<FinancingInfoDto> updateBySequenceNbrFinancingInfo(@RequestBody FinancingInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(financingInfoServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<FinancingInfoDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<Map<String, String>>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<Map<String, String>> page = new Page<Map<String, String>>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FinancingInfoDto>> selectForList() {
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HYGFMaintenanceTicketsController.java

@@ -40,10 +40,24 @@ public class HYGFMaintenanceTicketsController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增运维工单", notes = "新增运维工单")
 	public ResponseModel<HYGFMaintenanceTicketsDto> save(@RequestBody HYGFMaintenanceTicketsDto model) {
-	   hygfMaintenanceTicketsServiceimpl.sendMeassageToMcb(model);
+        model.setCreatorUserId(getUserId());
+	    hygfMaintenanceTicketsServiceimpl.sendMeassageToMcb(model);
 	    return ResponseHelper.buildResponse(model);
 	}
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/pageList")
+    @ApiOperation(httpMethod = "GET",value = "运维工单分页查询",  notes = "运维工单分页查询")
+    public ResponseModel<Page<HYGFMaintenanceTicketsDto>> queryForPageList(@RequestParam(value = "current") int current,
+                                                                           @RequestParam(value = "size") int size,
+                                                                           HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        Page<HYGFMaintenanceTicketsDto> page=  hygfMaintenanceTicketsServiceimpl.queryForPageList(current,size,hygfMaintenanceTicketsDto);
+        return ResponseHelper.buildResponse(page);
+    }
+
+
+
 	/**
      * 根据sequenceNbr更新
      *

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
@@ -151,15 +152,16 @@ public class HouseholdContractController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    @UserLimits
 	public ResponseModel<IPage< HouseholdContract > > queryForPage(HouseholdContractPageDto dto) {
 
 
-        //获取用户所在经销商单位
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(getUserId());
-
-         if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerId()!=null){
-             dto.setDealerId(userUnitInformationDto.getAmosDealerId());
-         }
+//        //获取用户所在经销商单位
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(getUserId());
+//
+//         if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerId()!=null){
+//             dto.setDealerId(userUnitInformationDto.getAmosDealerId());
+//         }
 
         return ResponseHelper.buildResponse(householdContractServiceImpl.queryForPreparationMoneyPage(dto));
 	}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java

@@ -302,7 +302,7 @@ public class JpInverterController extends BaseController {
         List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
         List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
-            dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
+            dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
         }
 //        List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
@@ -316,7 +316,7 @@ public class JpInverterController extends BaseController {
         List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
         List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
-            dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
+            dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
         }
       //  List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
         List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);
@@ -337,7 +337,7 @@ public class JpInverterController extends BaseController {
         List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
         List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
-            dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
+            dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
         }
        // List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
@@ -351,7 +351,7 @@ public class JpInverterController extends BaseController {
         List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
         List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
-            dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
+            dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
         }
        // List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
         List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.DealerRestrict;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DropDown;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
@@ -413,6 +416,22 @@ public class JpStationController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")
+    @GetMapping(value = "/getRegionAll")
+    public ResponseModel<List<Map<String, String>>> getRegionAll() {
+
+        List<DropDown> list = jpStationMapper.getRegionAll();
+        List<Map<String, String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
+            result.add(item);
+        });
+
+        return ResponseHelper.buildResponse(result);
+    }
 
     //查询当前登录人权限经销商
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -431,6 +450,21 @@ public class JpStationController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
+    @GetMapping(value = "/getDealerAll")
+    public ResponseModel<List<Map<String, String>>> getDealerAll(String regionalCompaniesCode) {
+        List<DropDown> list = jpStationMapper.getDealerAll(regionalCompaniesCode);
+        List<Map<String, String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
+            result.add(item);
+        });
+        return ResponseHelper.buildResponse(result);
+    }
+
     //电站发电量统计
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -511,43 +545,38 @@ public class JpStationController extends BaseController {
     @UserLimits
     public ResponseModel<Page<Map<String, Object>>> getjpStationConservation(JpStationDto reviewDto) {
         JpStationDto jpStation = jpStationMapper.getCountJpStationdata(reviewDto);
-
-
         List<Map<String, Object>> date = new ArrayList<>();
-
-
         Map<String, Object> map = new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("0.000");
         //炭
         map.put("name1", "实时功率(kW)");
         map.put("name2", "组件总容量(MWp)");
 
-        map.put("value1", format2.format(jpStation.getRealTimePower()));
+        map.put("value1", jpStation.getRealTimePower()!=null?format2.format(jpStation.getRealTimePower()):0);
         //硫
-        map.put("value2", format2.format(jpStation.getCapacity()));
-
+        map.put("value2", jpStation.getCapacity()!=null?format2.format(jpStation.getCapacity()):0);
 
         Map<String, Object> map2 = new HashMap<>();
         map2.put("name1", "当日电量(MWh)");
         map2.put("name2", "当日收益(元)");
         //炭
-        map2.put("value1", format2.format(jpStation.getDayGenerate()));
+        map2.put("value1", jpStation.getDayGenerate()!=null?format2.format(jpStation.getDayGenerate()):0);
         //硫
-        map2.put("value2", format2.format(jpStation.getDayIncome()));
+        map2.put("value2", jpStation.getDayIncome()!=null?format2.format(jpStation.getDayIncome()):0);
         Map<String, Object> map3 = new HashMap<>();
         map3.put("name1", "当月电量(MWh)");
         map3.put("name2", "当月收益(万元)");
         //炭
-        map3.put("value1", format2.format(jpStation.getMonthGenerate()));
+        map3.put("value1", jpStation.getMonthGenerate()!=null?format2.format(jpStation.getMonthGenerate()):0);
         //硫
-        map3.put("value2", format2.format(jpStation.getMonthIncome()));
+        map3.put("value2", jpStation.getMonthIncome()!=null?format2.format(jpStation.getMonthIncome()):0);
         Map<String, Object> map4 = new HashMap<>();
         map4.put("name1", "累计电量(MWh)");
         map4.put("name2", "累计收益(万元)");
         //炭
-        map4.put("value1", format2.format(jpStation.getAccumulatedPower()));
+        map4.put("value1", jpStation.getAccumulatedPower()!=null?format2.format(jpStation.getAccumulatedPower()):0);
         //硫
-        map4.put("value2", format2.format(jpStation.getCumulativeIncome()));
+        map4.put("value2", jpStation.getCumulativeIncome()!=null?format2.format(jpStation.getCumulativeIncome()):0);
 
         date.add(map);
         date.add(map2);
@@ -658,7 +687,7 @@ public class JpStationController extends BaseController {
                         map.put("id", jpStation.getSequenceNbr());
                         map.put("name", jpStation.getName());
                         map.put("address", jpStation.getAddress());
-                        map.put("fullhour", format2.format(dayGenerate.getFullhour()));
+                        map.put("fullhour", dayGenerate.getFullhour()!=null?format2.format(dayGenerate.getFullhour()):0);
                         li.add(map);
                         break;
                     }
@@ -699,6 +728,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryPagenew")
     @ApiOperation(httpMethod = "GET", value = "场站列表", notes = "场站列表")
+    @UserLimits
     public ResponseModel<Page<JpStationDto>> queryPagenew(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, JpStationDto reviewDto) {
         Page<JpStationDto> page = jpStationServiceImpl.queryForJpStationPagenew(current, size, reviewDto);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceController.java

@@ -25,7 +25,9 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceServiceImpl
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
@@ -50,6 +52,7 @@ public class MaintenanceController extends BaseController {
 
     @Autowired
     MaintenanceMapper maintenanceMapper;
+
     /**
      * 新增运维人员
      *
@@ -72,7 +75,7 @@ public class MaintenanceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员", notes = "根据sequenceNbr更新运维人员")
-    public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         model.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(maintenanceServiceImpl.updateWithModel(model));
     }
@@ -86,20 +89,20 @@ public class MaintenanceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除运维人员", notes = "根据sequenceNbr删除运维人员")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(maintenanceServiceImpl.removeById(sequenceNbr));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-     * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员",  notes = "根据sequenceNbr查询单个运维人员")
-    public ResponseModel<Map<String,Object> > selectOne(@PathVariable Long sequenceNbr) {
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个运维人员", notes = "根据sequenceNbr查询单个运维人员")
+    public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(maintenanceServiceImpl.selectOneById(sequenceNbr));
     }
 
@@ -112,68 +115,64 @@ public class MaintenanceController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET",value = "运维人员分页查询",  notes = "运维人员分页查询")
-    public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+    @ApiOperation(httpMethod = "GET", value = "运维人员分页查询", notes = "运维人员分页查询")
+    public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size,
-                                                         @RequestParam(required = false) String name,
-                                                         @RequestParam(required = false)String maintenanceTypeCode,
-                                                         @RequestParam(required = false)String maintenanceType,
-                                                         @RequestParam(required = false) String lockStatus,
-                                                         @RequestParam(required = false)String reviewStatus,
-                                                         @RequestParam(required = false)Long regionalCompaniesSeq,
-                                                         @RequestParam(required = false)Long dealerId,
-                                                         @RequestParam(required = false)String maintenanceAreaAddress
-    ) {
-        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage( current, size, name, maintenanceTypeCode,lockStatus,reviewStatus,regionalCompaniesSeq,dealerId,maintenanceType,maintenanceAreaAddress));
+                                                            @RequestParam(required = false) String name,
+                                                            @RequestParam(required = false) String maintenanceTypeCode,
+                                                            @RequestParam(required = false) String maintenanceType,
+                                                            @RequestParam(required = false) String lockStatus,
+                                                            @RequestParam(required = false) String reviewStatus,
+                                                            @RequestParam(required = false) Long regionalCompaniesSeq,
+                                                            @RequestParam(required = false) Long dealerId,
+                                                            @RequestParam(required = false) String maintenanceAreaAddress,
+                                                            @RequestParam(required = false) String regionalCompaniesCode,
+                                                            @RequestParam(required = false) String dealerCode
+                                                            ) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage(current, size, name, maintenanceTypeCode, lockStatus, reviewStatus, regionalCompaniesSeq, dealerId, maintenanceType, maintenanceAreaAddress,regionalCompaniesCode,dealerCode));
     }
 
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping (value = "examine/{sequenceNbr}")
-    @ApiOperation(httpMethod = "post",value = "审核单个运维人员",  notes = "审核单个运维人员")
-    public ResponseModel<Maintenance> examine(@PathVariable Long sequenceNbr,@RequestBody MaintenanceLog maintenanceLog) {
-        return ResponseHelper.buildResponse(maintenanceServiceImpl.examine(sequenceNbr,maintenanceLog));
+    @PostMapping(value = "examine/{sequenceNbr}")
+    @ApiOperation(httpMethod = "post", value = "审核单个运维人员", notes = "审核单个运维人员")
+    public ResponseModel<Maintenance> examine(@PathVariable Long sequenceNbr, @RequestBody MaintenanceLog maintenanceLog) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.examine(sequenceNbr, maintenanceLog));
     }
 
 
-
-
-
-
     /**
      * 列表全部数据查询
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "运维人员列表全部数据查询",   notes = "运维人员列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "运维人员列表全部数据查询", notes = "运维人员列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<MaintenanceDto>> selectForList(
             @RequestParam(required = false) String name, //运维人员类型
-            @RequestParam(required = false)String maintenanceType //运维人员类型code
+            @RequestParam(required = false) String maintenanceType //运维人员类型code
 
     ) {
         return ResponseHelper.buildResponse(maintenanceServiceImpl.queryList(
-                 name, //运维人员类型
+                name, //运维人员类型
                 maintenanceType //运维人员类型code
 
         ));
     }
 
 
-
     //查询当前登录人权限经销商
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @ApiOperation(httpMethod = "GET",value = "查询当前登录人权限经销商",   notes = "查询当前登录人权限经销商")
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
     @GetMapping(value = "/getDealer")
-    public ResponseModel<List<Map<String,String>>> getDealer(String regionalCompaniesCode ) {
-        List<DropDown>  list=  jpStationMapper.getDealerNew(regionalCompaniesCode);
-        List<Map<String,String>> result = new ArrayList<>();
+    public ResponseModel<List<Map<String, String>>> getDealer(String regionalCompaniesCode) {
+        List<DropDown> list = jpStationMapper.getDealerNew(regionalCompaniesCode);
+        List<Map<String, String>> result = new ArrayList<>();
         list.forEach(dropDown -> {
-            Map<String,String> item = new HashMap<>();
-            item.put("text",dropDown.getName());
-            item.put("value",dropDown.getOrgCode());
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
             result.add(item);
         });
         return ResponseHelper.buildResponse(result);
@@ -182,16 +181,16 @@ public class MaintenanceController extends BaseController {
 
     //查询当前登录人权限经销商
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "经销商人员加入黑名单/撤销黑名单",   notes = "经销商人员加入黑名单/撤销黑名单")
+    @ApiOperation(httpMethod = "GET", value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单")
     @GetMapping(value = "/updateUser")
-    public ResponseModel<Object> updateUser(Long sequenceNbr ,String type) {
-        maintenanceServiceImpl.updateUser( sequenceNbr , type);
+    public ResponseModel<Object> updateUser(Long sequenceNbr, String type) {
+        maintenanceServiceImpl.updateUser(sequenceNbr, type);
         return ResponseHelper.buildResponse(null);
     }
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "签订安全协议",   notes = "签订安全协议")
+    @ApiOperation(httpMethod = "GET", value = "签订安全协议", notes = "签订安全协议")
     @GetMapping(value = "/updateAgreement")
     public ResponseModel<Object> updateTrainingAgreement(String userId) {
         maintenanceServiceImpl.updateTrainingAgreement(userId);
@@ -199,13 +198,24 @@ public class MaintenanceController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET",value = "验证安全签订安全协议是否签订",   notes = "验证安全签订安全协议是否签订")
+    @ApiOperation(httpMethod = "GET", value = "验证安全签订安全协议是否签订", notes = "验证安全签订安全协议是否签订")
     @GetMapping(value = "/getTrainingAgreement")
     public ResponseModel<String> getTrainingAgreement(String userId) {
-        MaintenanceDto maintenanceDto=maintenanceMapper.getTrainingAgreement(userId);
-        if(maintenanceDto.getIsSignAnAgreement()!=null&&maintenanceDto.getIsSignAnAgreement()==1){
+        MaintenanceDto maintenanceDto = maintenanceMapper.getTrainingAgreement(userId);
+        if (maintenanceDto.getIsSignAnAgreement() != null && maintenanceDto.getIsSignAnAgreement() == 1) {
             return ResponseHelper.buildResponse("true");
         }
         return ResponseHelper.buildResponse("false");
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "验证是否完成培训及培训", notes = "验证是否完成培训及培训")
+    @GetMapping(value = "/getTrainingStatus")
+    public ResponseModel<Boolean> getTrainingStatus(String userId) {
+        MaintenanceDto maintenanceDto = maintenanceMapper.getTrainingAgreement(userId);
+        if (maintenanceDto.getIsSignAnAgreement() != null && maintenanceDto.getTrainingStatus().equals("已培训")) {
+            return ResponseHelper.buildResponse(Boolean.TRUE);
+        }
+        return ResponseHelper.buildResponse(Boolean.FALSE);
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PeasantHouseholdEnum;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.SurveyInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl;
@@ -201,23 +204,24 @@ public class PeasantHouseholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "农户信息分页查询",  notes = "农户信息分页查询")
-	public ResponseModel<Page<PeasantHouseholdDto>> queryForPage(@RequestParam(value = "current") int current,
-																 @RequestParam(value = "size") int size,
-																 @RequestParam(value = "ownersName",required = false)String ownersName,
-																 @RequestParam(value = "developerId",required = false)Long developerId) {
-	    Page<PeasantHouseholdDto> page = new Page<PeasantHouseholdDto>();
+	@UserLimits()
+	public ResponseModel<Page<PeasantHousehold>> queryForPage(@RequestParam(value = "current") int current,
+															  @RequestParam(value = "size") int size,
+															  @RequestParam(value = "ownersName",required = false)String ownersName,
+															  @RequestParam(value = "developerId",required = false)Long developerId) {
+	    Page<PeasantHousehold> page = new Page<PeasantHousehold>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
 
 
-        //获取用户所在经销商单位
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
-
-        String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
+//        //获取用户所在经销商单位
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
+//
+//        String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
 
 		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page,orgCode,ownersName,developerId,isCertified));
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PowerStationServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -95,10 +96,11 @@ public class PowerStationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    @UserLimits
 	public ResponseModel<Page<PowerStationDto>> queryForPage(@RequestParam(value = "current") int current,
-															 														@RequestParam(value = "size") int size,
-															 														@RequestParam(value = "powerStationCode",required = false)String powerStationCode,
-															 														@RequestParam(value = "ownersName",required = false)String ownersName) {
+                                                            @RequestParam(value = "size") int size,
+                                                            @RequestParam(value = "powerStationCode",required = false)String powerStationCode,
+                                                            @RequestParam(value = "ownersName",required = false)String ownersName) {
 	    Page<PowerStationDto> page = new Page<PowerStationDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
@@ -121,17 +122,18 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping (value = "/page")
 	@ApiOperation(httpMethod = "post",value = "发货单分页查询",  notes = "发货单分页查询")
+    @UserLimits
 	public ResponseModel<IPage<PreparationMoney>> queryForPage(@RequestBody  PreparationPageDto preparationPageDto
     ) {
 
 
         //获取用户所在经销商单位
-        AgencyUserModel userInfo = getUserInfo();
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
-
-        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
-            preparationPageDto.setAmosUnitId(String.valueOf(userUnitInformationDto.getAmosUnitInfoId()));
-        }
+//        AgencyUserModel userInfo = getUserInfo();
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
+//
+//        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
+//            preparationPageDto.setAmosUnitId(String.valueOf(userUnitInformationDto.getAmosUnitInfoId()));
+//        }
 
 	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(preparationPageDto));
 	}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -2,14 +2,17 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HYGFMaintenanceTicketsMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpPersonStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
@@ -41,260 +44,271 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/td-hygf-jp-inverter-warn")
 public class TdHygfJpInverterWarnController extends BaseController {
 
-	@Autowired
-	TdHygfJpInverterWarnServiceImpl tdHygfJpInverterWarnServiceImpl;
-	@Autowired
-	JpPersonStationMapper pPersonStationMapper;
-	@Autowired
-	TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
-	@Autowired
-	JpStationMapper jpStationMapper;
+    @Autowired
+    TdHygfJpInverterWarnServiceImpl tdHygfJpInverterWarnServiceImpl;
+    @Autowired
+    JpPersonStationMapper pPersonStationMapper;
+    @Autowired
+    TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
+    @Autowired
+    JpStationMapper jpStationMapper;
+    @Autowired
+    HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
+
+    /**
+     * 新增户用光伏监盘逆变器报警表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器报警表", notes = "新增户用光伏监盘逆变器报警表")
+    public ResponseModel<TdHygfJpInverterWarnDto> save(@RequestBody TdHygfJpInverterWarnDto model) {
+        model = tdHygfJpInverterWarnServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
 
-	/**
-	 * 新增户用光伏监盘逆变器报警表
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器报警表", notes = "新增户用光伏监盘逆变器报警表")
-	public ResponseModel<TdHygfJpInverterWarnDto> save(@RequestBody TdHygfJpInverterWarnDto model) {
-		model = tdHygfJpInverterWarnServiceImpl.createWithModel(model);
-		return ResponseHelper.buildResponse(model);
-	}
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘逆变器报警表", notes = "根据sequenceNbr更新户用光伏监盘逆变器报警表")
 
-	/**
-	 * 根据sequenceNbr更新
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘逆变器报警表", notes = "根据sequenceNbr更新户用光伏监盘逆变器报警表")
+    public ResponseModel<TdHygfJpInverterWarnDto> updateBySequenceNbrTdHygfJpInverterWarn(
+            @RequestBody TdHygfJpInverterWarnDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.updateWithModel(model));
 
-	public ResponseModel<TdHygfJpInverterWarnDto> updateBySequenceNbrTdHygfJpInverterWarn(
-			@RequestBody TdHygfJpInverterWarnDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.updateWithModel(model));
+    }
 
-	}
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘逆变器报警表", notes = "根据sequenceNbr删除户用光伏监盘逆变器报警表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.removeById(sequenceNbr));
+    }
 
-	/**
-	 * 根据sequenceNbr删除
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘逆变器报警表", notes = "根据sequenceNbr删除户用光伏监盘逆变器报警表")
-	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.removeById(sequenceNbr));
-	}
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
+    public ResponseModel<TdHygfJpInverterWarnDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryBySeq(sequenceNbr));
+    }
 
-	/**
-	 * 根据sequenceNbr查询
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
-	public ResponseModel<TdHygfJpInverterWarnDto> selectOne(@PathVariable Long sequenceNbr) {
-		return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryBySeq(sequenceNbr));
-	}
-	
-	/**
-	 * 根据sequenceNbr查询
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@GetMapping(value = "time/{createdTime}")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
-	public ResponseModel<TdHygfJpInverterWarnDto> selectCreatedTime(@PathVariable Long createdTime) {
-		return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryByCreatedTime(createdTime));
-	}
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "time/{createdTime}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
+    public ResponseModel<TdHygfJpInverterWarnDto> selectCreatedTime(@PathVariable Long createdTime) {
+        return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryByCreatedTime(createdTime));
+    }
 
-	/**
-	 * 列表分页查询
-	 *
-	 * @param current 当前页
-	 * @param current 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表分页查询", notes = "户用光伏监盘逆变器报警表分页查询")
-	public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
-        List<JpPersonStation> pPersonStation =null;
-        if(tdHygfJpInverterWarnDto.getName()!=null&&!"".equals(tdHygfJpInverterWarnDto.getName())){
-            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
-            qug1.like(JpPersonStation::getStationName,tdHygfJpInverterWarnDto.getName());
-            pPersonStation=pPersonStationMapper.selectList(qug1);
-        }else{
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表分页查询", notes = "户用光伏监盘逆变器报警表分页查询")
+    public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                                     @RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
+        List<JpPersonStation> pPersonStation = null;
+        if (tdHygfJpInverterWarnDto.getName() != null && !"".equals(tdHygfJpInverterWarnDto.getName())) {
+            LambdaQueryWrapper<JpPersonStation> qug1 = new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName, tdHygfJpInverterWarnDto.getName());
+            pPersonStation = pPersonStationMapper.selectList(qug1);
+        } else {
             LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
-             pPersonStation = pPersonStationMapper.selectList(qug);
+            pPersonStation = pPersonStationMapper.selectList(qug);
 
 
         }
 
-		if (!pPersonStation.isEmpty()) {
-			Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
-			page.setCurrent(current);
-			page.setSize(size);
-			List<String> ids = pPersonStation.stream().map(i -> i.getStationId()).collect(Collectors.toList());
-			tdHygfJpInverterWarnDto.setStationIds(ids);
-			return ResponseHelper.buildResponse(
-					tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnPage(page, tdHygfJpInverterWarnDto));
-		} else {
-			return ResponseHelper.buildResponse(new Page<TdHygfJpInverterWarnDto>());
-		}
+        if (!pPersonStation.isEmpty()) {
+            Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
+            page.setCurrent(current);
+            page.setSize(size);
+            List<String> ids = pPersonStation.stream().map(i -> i.getStationId()).collect(Collectors.toList());
+            tdHygfJpInverterWarnDto.setStationIds(ids);
+            return ResponseHelper.buildResponse(
+                    tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnPage(page, tdHygfJpInverterWarnDto));
+        } else {
+            return ResponseHelper.buildResponse(new Page<TdHygfJpInverterWarnDto>());
+        }
 
-	}
+    }
 
-	/**
-	 * 列表全部数据查询
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<TdHygfJpInverterWarnDto>> selectForList() {
-		return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnList());
-	}
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<TdHygfJpInverterWarnDto>> selectForList() {
+        return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnList());
+    }
 
-     /**
-      * 获取告警统计
-      * **/
+    /**
+     * 获取告警统计
+     **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
     @GetMapping(value = "/selectcount")
-    public ResponseModel<  Map<String,Object>  > selectcount(JpStationDto reviewDto) {
-        LambdaQueryWrapper<JpStation> qugda=new LambdaQueryWrapper<>();
-
-
-
-
-
+    public ResponseModel<Map<String, Object>> selectcount(JpStationDto reviewDto) {
+        LambdaQueryWrapper<JpStation> qugda = new LambdaQueryWrapper<>();
 
         //获取当前人管理场站
-        if(reviewDto.getThirdStationId()==null){
+        if (reviewDto.getThirdStationId() == null) {
             //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
 
-            if(pPersonStation==null||pPersonStation.isEmpty()){
-                return  ResponseHelper.buildResponse(null);
+            if (pPersonStation == null || pPersonStation.isEmpty()) {
+                return ResponseHelper.buildResponse(null);
             }
-
-
-            List ids=null;
-            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
-                ids=new ArrayList();
+            List ids = null;
+            if (pPersonStation != null && !pPersonStation.isEmpty()) {
+                ids = new ArrayList();
                 for (JpPersonStation jpPersonStation : pPersonStation) {
                     ids.add(jpPersonStation.getStationId());
                 }
-                qugda.in(ids!=null,JpStation::getThirdStationId,ids);
+                qugda.in(ids != null, JpStation::getThirdStationId, ids);
             }
-        }else{
-            qugda.eq(JpStation::getThirdStationId,reviewDto.getThirdStationId());
+        } else {
+            qugda.eq(JpStation::getThirdStationId, reviewDto.getThirdStationId());
         }
-        qugda.like(reviewDto.getName()!=null,JpStation::getName,reviewDto.getName());
-        qugda.like(reviewDto.getArea()!=null,JpStation::getArea,reviewDto.getArea());
-        List<JpStation> pPersonStation=jpStationMapper.selectList(qugda);
-        List<Map<String,Object>>   datalist=    tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation!=null&&!pPersonStation.isEmpty()?pPersonStation:null);
-        Map<String,Object>  collector =new HashMap<>();
-        collector.put("wcl",0);
-        collector.put("ycl",0);
-
-        if(datalist!=null&&!datalist.isEmpty()){
-            for (Map<String, Object> map  : datalist) {
-                if("未处理".equals(map.get("state").toString())){
-                    collector.put("wcl",Integer.valueOf(map.get("num").toString()));
-                }else if("已处理".equals(map.get("state").toString())||"已恢复".equals(map.get("state").toString())){
-                    collector.put("ycl",Integer.valueOf(map.get("num").toString()));
+        qugda.like(reviewDto.getName() != null, JpStation::getName, reviewDto.getName());
+        qugda.like(reviewDto.getArea() != null, JpStation::getArea, reviewDto.getArea());
+        List<JpStation> pPersonStation = jpStationMapper.selectList(qugda);
+        List<Map<String, Object>> datalist = tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation != null && !pPersonStation.isEmpty() ? pPersonStation : null);
+        Map<String, Object> collector = new HashMap<>();
+        collector.put("wcl", 0);
+        collector.put("ycl", 0);
+
+        if (datalist != null && !datalist.isEmpty()) {
+            for (Map<String, Object> map : datalist) {
+                if ("未处理".equals(map.get("state").toString())) {
+                    collector.put("wcl", Integer.valueOf(map.get("num").toString()));
+                } else if ("已处理".equals(map.get("state").toString()) || "已恢复".equals(map.get("state").toString())) {
+                    collector.put("ycl", Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
         return ResponseHelper.buildResponse(collector);
     }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
-	@GetMapping(value = "/selectWarnList")
-	@UserLimits
-	public ResponseModel<Page<TdHygfJpInverterWarnDto>> selectWarnList(@RequestParam(required = false) String state,
-																@RequestParam(required = false) String handlerStatus,
-																@RequestParam(required = false) String level,
-																@RequestParam(required = false) String stationName,
-																@RequestParam(required = false) String minvalue,
-																@RequestParam(required = false) String maxValue,
-																@RequestParam(required = false) String snCode,
-																@RequestParam(required = false) List<String> stationId,
-																@RequestParam(required = false) String[] time,
-																@RequestParam(required = false) Integer current,
-																@RequestParam(required = false) Integer size,
-																@RequestParam(required = false) String content) {
-
-    	Page<TdHygfJpInverterWarnDto> result = new Page<>();
-		result.setCurrent(current);
-		result.setSize(size);
-    	JpStationDto reviewDto = new JpStationDto();
-		Map<String, String> nameMaps = new HashMap<>();
-		if (null != stationName && stationName != ""){
-			reviewDto.setName(stationName);
-		}
-		List<JpStation> jpStation = jpStationMapper.getJpStation(reviewDto);
-		if (CollectionUtil.isEmpty(jpStation)){
-			result.setTotal(0);
-			List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
-			result.setRecords(list);
-			return ResponseHelper.buildResponse(result);
-
-		}
-		nameMaps = jpStation.stream().collect(Collectors.toMap(JpStation::getThirdStationId, JpStation::getName));
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
+    @GetMapping(value = "/selectWarnList")
+    @UserLimits
+    public ResponseModel<Page<TdHygfJpInverterWarnDto>> selectWarnList(@RequestParam(required = false) String state,
+                                                                       @RequestParam(required = false) String handlerStatus,
+                                                                       @RequestParam(required = false) String level,
+                                                                       @RequestParam(required = false) String stationName,
+                                                                       @RequestParam(required = false) String minvalue,
+                                                                       @RequestParam(required = false) String maxValue,
+                                                                       @RequestParam(required = false) String snCode,
+                                                                       @RequestParam(required = false) List<String> stationId,
+                                                                       @RequestParam(required = false) String[] time,
+                                                                       @RequestParam(required = false) Integer current,
+                                                                       @RequestParam(required = false) Integer size,
+                                                                       @RequestParam(required = false) String content) {
+
+        Page<TdHygfJpInverterWarnDto> result = new Page<>();
+        result.setCurrent(current);
+        result.setSize(size);
+        JpStationDto reviewDto = new JpStationDto();
+        Map<String, String> nameMaps = new HashMap<>();
+        if (null != stationName && stationName != "") {
+            reviewDto.setName(stationName);
+        }
+        List<JpStation> jpStation = jpStationMapper.getJpStation(reviewDto);
+        if (CollectionUtil.isEmpty(jpStation)) {
+            result.setTotal(0);
+            List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
+            result.setRecords(list);
+            return ResponseHelper.buildResponse(result);
 
-		if (null == stationId ){
-			stationId = jpStation.stream().map(JpStation::getThirdStationId).collect(Collectors.toList());
-		}
-		String startTime ="";
-		String endTime = "";
-		if (null != time){
+        }
+        nameMaps = jpStation.stream().collect(Collectors.toMap(JpStation::getThirdStationId, JpStation::getName, (existing, replacement) -> existing));
 
-			try {
-				startTime = String.valueOf( DateUtils.dateParse(time[0].replace("[",""), null).getTime());
-				Date date = DateUtils.dateParse(time[1].replace("]", ""), null);
-				endTime = String.valueOf(DateUtils.dateAddDays(date,1).getTime());
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		if (StringUtils.isNotEmpty(snCode)){
-			snCode = '%'+snCode+'%';
-		}
-		if (StringUtils.isNotEmpty(content)){
-			content = '%'+content+'%';
-		}
-		List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,current,size,handlerStatus);
-		for (TdHygfJpInverterWarnDto map : maps) {
-			if (nameMaps.containsKey(map.getThirdStationId())){
-				map.setStationName(nameMaps.get(map.getThirdStationId()));
-			}
-          String te=  map.getTimeLong()!=null?TimeUtil.longFormat(map.getTimeLong()):"";
-			map.setTimeLongFormat(te);
-		}
+        if (null == stationId) {
+            stationId = jpStation.stream().map(JpStation::getThirdStationId).collect(Collectors.toList());
+        }
+        String startTime = "";
+        String endTime = "";
+        if (null != time) {
+
+            try {
+                startTime = String.valueOf(DateUtils.dateParse(time[0].replace("[", ""), null).getTime());
+                Date date = DateUtils.dateParse(time[1].replace("]", ""), null);
+                endTime = String.valueOf(DateUtils.dateAddDays(date, 1).getTime());
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotEmpty(snCode)) {
+            snCode = '%' + snCode + '%';
+        }
+        if (StringUtils.isNotEmpty(content)) {
+            content = '%' + content + '%';
+        }
+        List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, current, size, handlerStatus);
+        for (TdHygfJpInverterWarnDto map : maps) {
+            if (nameMaps.containsKey(map.getThirdStationId())) {
+                map.setStationName(nameMaps.get(map.getThirdStationId()));
+            }
+            String te = map.getTimeLong() != null ? TimeUtil.longFormat(map.getTimeLong()) : "";
+            map.setTimeLongFormat(te);
+        }
 
-		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus));
-		result.setRecords(maps);
-		return ResponseHelper.buildResponse(result);
-	}
+        result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus));
+        List<Long> waringIds = maps.stream().map(tdHygfJpInverterWarnDto -> tdHygfJpInverterWarnDto.getCreatedTime()).collect(Collectors.toList());
+        if (waringIds.size() == 0) {
+            waringIds = Arrays.asList(0L);
+        }
+        List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id", waringIds));
+        if (hygfMaintenanceTicketsList.size() > 0) {
+            maps.forEach(tdHygfJpInverterWarnDto -> {
+                Set<String> status = hygfMaintenanceTicketsList.stream().filter(hygfmaintenanceTickets -> tdHygfJpInverterWarnDto.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
+                if (status.contains("未处理")) {
+                    tdHygfJpInverterWarnDto.setTicketStatus("处理中");
+                }
+                if (status.contains("已处理") && status.size() == 1) {
+                    tdHygfJpInverterWarnDto.setTicketStatus("已处理");
+                }
+            });
+        }
+        result.setRecords(maps);
+        return ResponseHelper.buildResponse(result);
+    }
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
@@ -669,25 +670,31 @@ public class UnitInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "获取审核通过的经销商",   notes = "获取审核通过的经销商")
     @GetMapping(value = "/getlistUnitInfo")
+    @UserLimits
     public ResponseModel<List<UnitInfo>> getlistUnitInfo() {
 
-       LambdaQueryWrapper<UnitInfo> qu=new LambdaQueryWrapper();
-        qu.eq(UnitInfo::getIsDelete,false);
-        qu.eq(UnitInfo::getAuditStatus,2);
-        List<UnitInfo> list=unitInfoMapper.selectList(qu);
+//       LambdaQueryWrapper<UnitInfo> qu=new LambdaQueryWrapper();
+//        qu.eq(UnitInfo::getIsDelete,false);
+//        qu.eq(UnitInfo::getAuditStatus,2);
+ //       List<UnitInfo> list=unitInfoMapper.selectList(qu);
+
+        List<UnitInfo> list=unitInfoMapper.getlistUnitInfo();
         return ResponseHelper.buildResponse(list);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
     @GetMapping(value = "/getRegionalCompanie")
+    @UserLimits
     public ResponseModel< List<RegionalCompanies> > getRegionalCompanie(
             @RequestParam(required=false) Long sequenceNbr
     ) {
-       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
-        qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
-        qu.eq(RegionalCompanies::getIsDelete,false);
-        List<RegionalCompanies>  list=regionalCompaniesMapper.selectList(qu);
+//       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
+//        qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
+//        qu.eq(RegionalCompanies::getIsDelete,false);
+//        List<RegionalCompanies>  list=regionalCompaniesMapper.selectList(qu);
+
+        List<RegionalCompanies>  list=regionalCompaniesMapper.selectListRegionalCompanies(sequenceNbr);
         return ResponseHelper.buildResponse(list);
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionRecords;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -123,13 +124,14 @@ public class WorkOrderController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping   (value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询",  notes = "施工派工工单分页查询")
+    @UserLimits
 	public ResponseModel<Page<WorkOrder>> queryForPage(@RequestBody WorkOrder  workOrder
     ) {
 
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-
-        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
-        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+//
+//        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
+//        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
 
         return ResponseHelper.buildResponse(workOrderServiceImpl.selectPage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
 	}
@@ -167,15 +169,16 @@ public class WorkOrderController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/wgpage")
     @ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询",  notes = "施工派工工单分页查询")
+    @UserLimits
     public ResponseModel<Page<WorkOrderPage>> queryForwgpage(
                                                          @RequestBody WorkOrderPage  workOrder
     ) {
 
 	     //当前登录人所属场站
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-
-        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
-        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+//
+//        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
+//        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
 
         return ResponseHelper.buildResponse(workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

@@ -76,8 +76,8 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
             String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
             Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
             if(warningId>0){
-               List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId));
-                if (hygfMaintenanceTicketsList.size()>0) {
+               List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId).eq("handler_status","未处理"));
+                if (hygfMaintenanceTicketsList.size()==1) {
                     return;
                 }
             }
@@ -146,10 +146,10 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
 
 
             hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
-            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
-                tdHygfJpInverterWarn.setHandlerStatus("处理中");
-                tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
-            }
+//            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+//                tdHygfJpInverterWarn.setHandlerStatus("处理中");
+//                tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+//            }
             log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));
         }
     }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -117,6 +119,14 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
         workflow.standard(basicGridAcceptanc,standardDto,userId);
         basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
+
+        //线上验收
+        LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+        up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线上验收.getCode());
+        long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+        up.eq(PeasantHousehold::getSequenceNbr,idsk);
+        peasantHouseholdMapper.update(null,up);
+
     }
 
 

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

@@ -43,6 +43,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     @Autowired
     WorkOrderMapper workOrderMapper;
 
+
+    @Autowired
+    PeasantHouseholdMapper peasantHouseholdMapper;
+
     private final  String OK ="0";
     private final  String PASS ="5";
 
@@ -104,6 +108,15 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
            startProcessDto.setProcess(process);
            workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
 
+           //线上验收
+           LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+           up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网中.getCode());
+           long idsk= basicGridAcceptance.getPeasantHouseholdId();
+           up.eq(PeasantHousehold::getSequenceNbr,idsk);
+           peasantHouseholdMapper.update(null,up);
+
+
+
        }
         if(grid.getSequenceNbr()!=null){
             onGridMapper.updateById(grid);
@@ -154,11 +167,19 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
                 upq.eq(HygfOnGrid::getSequenceNbr, dto.getFonGridId());
                 upq.set(HygfOnGrid::getGridConnectionTime, new Date());
                 onGridMapper.update(null, upq);
+                //并网完成
+                LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
+                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.并网完成.getCode());
+                long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+                up.eq(PeasantHousehold::getSequenceNbr,idsk);
+                peasantHouseholdMapper.update(null,up);
+
             } else {
 
                 basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
             }
 
+
         } else {
             if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
                 basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
@@ -210,7 +231,26 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         standardDto.setVariable(variable);
         BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc, standardDto, userId);
 
+        if (workBasicGridAcceptance.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
+            //线下验收
+            LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
+            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.线下验收.getCode());
+            long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+            up.eq(PeasantHousehold::getSequenceNbr,idsk);
+            peasantHouseholdMapper.update(null,up);
+        }
+
+        //验收完成
+        if(workBasicGridAcceptance.getNextTaskId()==null){
+
+            //更新状态
+            LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
+            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.验收完成.getCode());
+            long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+            up.eq(PeasantHousehold::getSequenceNbr,idsk);
+            peasantHouseholdMapper.update(null,up);
 
+        }
 
         basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
     }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FileInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.FileInformation;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FileInformationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFileInformationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 业务文件服务实现类

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingAuditingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingAuditingService;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 投融审核表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@Service
+public class FinancingAuditingServiceImpl extends BaseService<FinancingAuditingDto, FinancingAuditing, FinancingAuditingMapper> implements IFinancingAuditingService {
+    /**
+     * 分页查询
+     */
+    public Page<FinancingAuditingDto> queryForFinancingAuditingPage(Page<FinancingAuditingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FinancingAuditingDto> queryForFinancingAuditingList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/FinancingInfoServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfo;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2024-04-01
+ */
+@Service
+public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,FinancingInfo,FinancingInfoMapper> implements IFinancingInfoService {
+    /**
+     * 分页查询
+     */
+    @Autowired
+    private FinancingInfoMapper financingInfoMapper;
+    @Autowired
+    private WorkflowImpl workflow;
+
+
+    public Page<Map<String, String>> queryForFinancingInfoPage(Page<Map<String, String>> page)   {
+
+        PageHelper.startPage((int)page.getCurrent(),(int)page.getSize());
+        List<Map<String, String>> list = financingInfoMapper.getStationFinancingInfoList();
+        PageInfo<Map<String, String>> infos = new PageInfo<>(list);
+        page.setRecords(list);
+        page.setTotal(infos.getTotal());
+        return page;
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FinancingInfoDto> queryForFinancingInfoList()   {
+        return this.queryForList("" , false);
+    }
+
+    public FinancingInfoDto saveModel(FinancingInfoDto model) {
+        this.createWithModel(model);
+        return null;
+    }
+}
\ 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/HYGFMaintenanceTicketsServiceImpl.java

@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.nio.charset.StandardCharsets;
@@ -42,8 +43,9 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
      * 分页查询
      */
     public Page<HYGFMaintenanceTicketsDto> queryForHYGFMaintenanceTicketsDtoPage(int current, int size, HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        String amosUserId = RequestContext.getExeUserId();
         PageHelper.startPage(current, size);
-        List<HYGFMaintenanceTicketsDto> hygfMaintenanceTicketsDtos = this.getBaseMapper().qureyListByQueryparams(hygfMaintenanceTicketsDto);
+        List<HYGFMaintenanceTicketsDto> hygfMaintenanceTicketsDtos = this.getBaseMapper().qureyListByQueryparams(hygfMaintenanceTicketsDto,amosUserId);
         PageInfo<HYGFMaintenanceTicketsDto> page = new PageInfo<>(hygfMaintenanceTicketsDtos);
         Page<HYGFMaintenanceTicketsDto> pageNew = new Page<>();
         pageNew.setCurrent(current);
@@ -187,14 +189,29 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
             hygfMaintenanceTicketsDto.setWarningDuration(day+"天"+hour+"小时"+minute+"分钟");
         }
         this.updateWithModel(hygfMaintenanceTicketsDto);
-        if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
-            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId());
-            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
-                tdHygfJpInverterWarn.setHandlerStatus("已处理");
-            }
-            tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
-        }
+//        if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
+//            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId());
+//            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+//                tdHygfJpInverterWarn.setHandlerStatus("已处理");
+//            }
+//            tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+//        }
         log.info("更新运维工单成功{}", JSON.toJSONString(hygfMaintenanceTicketsDto));
         return hygfMaintenanceTicketsDto;
     }
+
+
+
+    public Page<HYGFMaintenanceTicketsDto> queryForPageList(int current, int size, HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
+        String amosUserId = RequestContext.getExeUserId();
+        PageHelper.startPage(current, size);
+        List<HYGFMaintenanceTicketsDto> hygfMaintenanceTicketsDtos = this.getBaseMapper().queryForPageList(hygfMaintenanceTicketsDto,amosUserId);
+        PageInfo<HYGFMaintenanceTicketsDto> page = new PageInfo<>(hygfMaintenanceTicketsDtos);
+        Page<HYGFMaintenanceTicketsDto> pageNew = new Page<>();
+        pageNew.setCurrent(current);
+        pageNew.setTotal(page.getTotal());
+        pageNew.setSize(size);
+        pageNew.setRecords(page.getList());
+        return pageNew;
+    }
 }

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

@@ -70,26 +70,26 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
      */
     public IPage<HouseholdContract> queryForPreparationMoneyPage(HouseholdContractPageDto dto)   {
 
-        //列表数据组装
-        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() );
-        qw.eq(dto.getDealerId()!=null, "dealer_id",dto.getDealerId() );
-        qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
-        qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
-        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "project_user_id",dto.getUserId() );
-        qw.like(StringUtils.isNotEmpty(dto.getPartyA()), "party_a",dto.getPartyA() );
-
-
-        if (StringUtils.isNotEmpty(dto.getOrderBy())) {
-            qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
-        }else{
-            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "rec_date");
-        }
-        IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto, qw);
+//        //列表数据组装
+//        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() );
+//        qw.eq(dto.getDealerId()!=null, "dealer_id",dto.getDealerId() );
+//        qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
+//        qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
+//        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "project_user_id",dto.getUserId() );
+//        qw.like(StringUtils.isNotEmpty(dto.getPartyA()), "party_a",dto.getPartyA() );
+//
+//
+//        if (StringUtils.isNotEmpty(dto.getOrderBy())) {
+//            qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
+//        }else{
+//            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "rec_date");
+//        }
+        IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto);
 
         return warningQuestionInfoIPage;
     }

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -86,20 +87,16 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
      */
 
     public Page<JpStationDto> queryForJpStationPagenew(int pageNum, int pageSize, JpStationDto reviewDto)   {
-
-
-        Page<JpStationDto> page = new Page<>(pageNum, pageSize);
-
-        List<JpStationDto> list = jpStationMapper.queryForDealerReviewPagenew(reviewDto,  page );
-
-        page.setRecords(list);
-//        PageInfo<JpStationDto> page = new PageInfo(list);
+        Page<JpStationDto> pageNew = new Page<>(pageNum, pageSize);
 //        com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
-//        pagenew.setCurrent(pageNum);
-//        pagenew.setTotal(page.getTotal());
-//        pagenew.setSize(pageSize);
-//        pagenew.setRecords(page.getList());
-        return page;
+        PageHelper.startPage(pageNum, pageSize);
+        List<JpStationDto> list = jpStationMapper.queryForDealerReviewPagenew(reviewDto);
+        PageInfo<JpStationDto> page = new PageInfo(list);
+        pageNew.setCurrent(pageNum);
+        pageNew.setTotal(page.getTotal());
+        pageNew.setSize(pageSize);
+        pageNew.setRecords(page.getList());
+        return pageNew;
     }
 
     @Override
@@ -178,12 +175,15 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
 
     public List<JpStation>getJpStationList (JpStationDto reviewDto){
-        List<JpInverter> dataJpInverter=jpInverterMapper.selectList(new QueryWrapper<JpInverter>().isNotNull("third_station_id"));
+        List<JpInverter> dataJpInverter=jpInverterMapper.selectList(new QueryWrapper<JpInverter>().isNotNull("third_station_id").isNotNull("sn_code"));
         Map<String,List<String>> inverterMap=dataJpInverter.stream().collect(Collectors.groupingBy(JpInverter::getThirdStationId,Collectors.mapping(JpInverter::getSnCode,Collectors.toList())));
         List<JpStation> list= jpStationMapper.getJpStationList(reviewDto);
         list.forEach(jpStation -> {
-            jpStation.setSnCodes(inverterMap.get(jpStation.getThirdStationId()));
+            List<String> sncodes =inverterMap.get(jpStation.getThirdStationId()).stream().distinct().collect(Collectors.toList());
+            sncodes = sncodes.stream().filter(s->s.trim().length()>1).collect(Collectors.toList());
+            jpStation.setSnCodes(sncodes);
         });
+        list =list.stream().filter(jpStation -> jpStation.getSnCodes().size()>0).collect(Collectors.toList());
         return list;
     }
     @Override
@@ -410,6 +410,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             if(dataJpStation!=null&&dataJpStation.size()>0){
         switch (type){
             case"day":
+                if (StringUtils.isEmpty(reviewDto.getTimeDate())){
+                    reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
+                }
                 LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
                 wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
                 wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
@@ -418,6 +421,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                 list = getJpStationDtoday(  dataJpStation,   listday);
                 break;
             case"month":
+                if (StringUtils.isEmpty(reviewDto.getTimeDate())){
+                    reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM"));
+                }
                 LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
                 wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
                 wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
@@ -427,6 +433,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                 list = getJpStationDtomonth(  dataJpStation,   listmonth);
                 break;
             case"year":
+                if (StringUtils.isEmpty(reviewDto.getTimeDate())){
+                    reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy"));
+                }
                 LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
                 wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
                 wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.MaintenanceTypeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
@@ -24,6 +25,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,9 +76,11 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
 
     @Autowired
     RedisUtils redisUtil;
-    private static final String regionRedis="app_region_redis";
-
+    private static final String regionRedis="app_region_redis_data";
     private static final Integer isSignAnAgreement = 1;
+    private  static final  String SMSTEMPCODENO="SMS_HYGF_0003";
+    private  static final  String SMSTEMPCODEYES="SMS_HYGF_0004";
+
 
     @Value("${amos.secret.key}")
     String secretKey;
@@ -84,10 +88,10 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
      * 分页查询
      */
     public Page<MaintenanceDto> queryForMaintenancePage( int current,int size,String name, String maintenanceTypeCode,  String lockStatus, String reviewStatus,Long regionalCompaniesSeq, Long dealerId
-    ,String maintenanceType,String maintenanceAreaAddress)   {
+    ,String maintenanceType,String maintenanceAreaAddress,String regionalCompaniesCode, String dealerCode)   {
 
         PageHelper.startPage(current,  size);
-        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId,maintenanceType,maintenanceAreaAddress);
+        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId,maintenanceType,maintenanceAreaAddress,regionalCompaniesCode,dealerCode);
         PageInfo<MaintenanceDto> page = new PageInfo(resultPage);
         Page<MaintenanceDto> pagenew = new Page<MaintenanceDto>();
         pagenew.setCurrent(current);
@@ -146,47 +150,47 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
         model.setDealerId(unitInfo!=null?unitInfo.getSequenceNbr():null);
         model.setDealerName(unitInfo!=null?unitInfo.getName():null);
         //运维区域 name
-        JSONArray regionName = getRegionName();
-        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
-        if(model.getMaintenanceAreaCode()!=null){
-            String ConsigneeRegion="";
-            List<Integer>  da=model.getMaintenanceAreaCode();
-            if(da!=null&&!da.isEmpty()){
-                for (int i = 0; i < da.size(); i++) {
-                    for (RegionModel re : list) {
-                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
-                            if(da.size()-1==i){
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
-                            }else{
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
-                            }
-                            break;
-                        }
-                    }
-                }
-                model.setMaintenanceArea(ConsigneeRegion);
-            }
-        }
+//        JSONArray regionName = getRegionName();
+//        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+//        if(model.getMaintenanceAreaCode()!=null){
+//            String ConsigneeRegion="";
+//            List<Integer>  da=model.getMaintenanceAreaCode();
+//            if(da!=null&&!da.isEmpty()){
+//                for (int i = 0; i < da.size(); i++) {
+//                    for (RegionModel re : list) {
+//                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+//                            if(da.size()-1==i){
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+//                            }else{
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+//                            }
+//                            break;
+//                        }
+//                    }
+//                }
+//                model.setMaintenanceArea(ConsigneeRegion);
+//            }
+//        }
         //设置常住地址
-        if(model.getPermanentAddressCode()!=null){
-            String ConsigneeRegion="";
-            List<Integer>  da=model.getPermanentAddressCode();
-            if(da!=null&&!da.isEmpty()){
-                for (int i = 0; i < da.size(); i++) {
-                    for (RegionModel re : list) {
-                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
-                            if(da.size()-1==i){
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
-                            }else{
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
-                            }
-                            break;
-                        }
-                    }
-                }
-                model.setPermanentAddressName(ConsigneeRegion);
-            }
-        }
+//        if(model.getPermanentAddressCode()!=null){
+//            String ConsigneeRegion="";
+//            List<Integer>  da=model.getPermanentAddressCode();
+//            if(da!=null&&!da.isEmpty()){
+//                for (int i = 0; i < da.size(); i++) {
+//                    for (RegionModel re : list) {
+//                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+//                            if(da.size()-1==i){
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+//                            }else{
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+//                            }
+//                            break;
+//                        }
+//                    }
+//                }
+//                model.setPermanentAddressName(ConsigneeRegion);
+//            }
+//        }
         //存储std
         //新增人员基础信息表
         PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
@@ -232,7 +236,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
             Collection<RegionModel> regionChild = new ArrayList<>();
             RegionModel regionModel1 = new RegionModel();
             regionChild.add(regionModel1);
-            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(610000L);
+            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(null);
             Collection<RegionModel> result = collectionFeignClientResult.getResult();
             for (RegionModel regionModel : result) {
                 if (null != regionModel && null != regionModel.getChildren()) {
@@ -257,12 +261,19 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
 
     //详情
     public Map<String,Object>  selectOneById(Long sequenceNbr){
-     MaintenanceDto maintenanceDto=    maintenanceMapper.selectOneById(sequenceNbr);
+        MaintenanceDto maintenanceDto=    maintenanceMapper.selectOneById(sequenceNbr);
 
         maintenanceDto.setIdCardFrontList(maintenanceDto.getIdCardFront()!=null?JSONArray.parseArray(maintenanceDto.getIdCardFront()):null);
         maintenanceDto.setIdCardOppositeList(maintenanceDto.getIdCardFront()!=null?JSONArray.parseArray(maintenanceDto.getIdCardOpposite()):null);
 
-     //获取文档
+        if (!maintenanceDto.getReviewStatus().equals("审核中")){
+            MaintenanceLog maintenanceLog = maintenanceLogMapper.selectOne(new QueryWrapper<MaintenanceLog>().lambda().eq(MaintenanceLog::getMaintenanceId, sequenceNbr));
+            maintenanceDto.setNotes(maintenanceLog.getNotes());
+            maintenanceDto.setOperator(maintenanceLog.getOperator());
+            maintenanceDto.setOperationTime(maintenanceLog.getOperationTime());
+        }
+
+        //获取文档
       List<MaintenanceFile>   list=  maintenanceFileMapper.selectList(
                 new QueryWrapper<MaintenanceFile>().lambda().eq(MaintenanceFile::getMaintenanceId, sequenceNbr)
       );
@@ -292,6 +303,16 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
         if (maintenanceLog.getOperationResults().equals(MaintenanceUtil.BH)) {
             maintenance.setReviewStatus(MaintenanceUtil.BH);
             maintenanceMapper.updateById(maintenance);
+
+            HashMap<String, String> params = new HashMap<>(3);
+            params.put("code","不通过");
+            params.put("mobile",maintenanceDto.getTelephone());
+            params.put("smsCode", SMSTEMPCODENO);
+            FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+
+
+
+
             return maintenance;
         } else {
             //如果通过添加平台账号
@@ -346,6 +367,13 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
                 publicAgencyUser.setRole(JSON.toJSONString(roleIds));
                 publicAgencyUserMapper.updateById(publicAgencyUser);
                 maintenanceMapper.updateById(maintenance);
+
+                HashMap<String, String> params = new HashMap<>(3);
+                params.put("code","通过");
+                params.put("mobile",maintenanceDto.getTelephone());
+                params.put("smsCode", SMSTEMPCODEYES);
+                FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+
                 return maintenance;
             } catch (Exception e) {
                 if (userResult != null && userResult.getResult() != null

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

@@ -3,10 +3,14 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PhoneRegisterTypeEum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
@@ -107,6 +111,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     CommercialServiceImpl commercialService;
 
     @Autowired
+    PeasantHouseholdMapper peasantHouseholdMapper;
+
+    @Autowired
     SurveyInformationServiceImpl surveyInformationServiceImpl;
 
     @Autowired
@@ -149,6 +156,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         PeasantHousehold peasantHousehold = new PeasantHousehold();
         BeanUtils.copyProperties(model, peasantHousehold);
+        peasantHousehold.setConstructionState(ArrivalStateeEnum.待勘察.getCode());
         this.saveOrUpdate(peasantHousehold);
         //生成合同
         HouseholdContract householdContract=new HouseholdContract();
@@ -220,10 +228,17 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     /**
      * 分页查询
      */
-    public Page<PeasantHouseholdDto> queryForPeasantHouseholdPage(Page<PeasantHouseholdDto> page,String developerCode,@Condition(Operator.like) String ownersName,Long developerId, @Condition(Operator.eq) Integer isCertified)   {
-        Page<PeasantHouseholdDto> peasantHouseholdDtoPage = this.queryForPage(page, "rec_date", false,developerCode,ownersName,developerId, isCertified);
-        List<PeasantHouseholdDto> records = peasantHouseholdDtoPage.getRecords();
-        List<PeasantHouseholdDto> newRecords = records.stream().map(item -> {
+
+    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified)   {
+        int current = (int)page.getCurrent();
+        int size = (int)page.getSize();
+
+        PageHelper.startPage(current,size);
+        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified);
+        PageInfo<PeasantHousehold> objectPageInfo = new PageInfo<PeasantHousehold>(records);
+
+
+        List<PeasantHousehold> newRecords = records.stream().map(item -> {
             if(item.getSurveyOrNot() != null){
                 if (item.getSurveyOrNot() == 0) {
                     item.setSurveyOrNotText("待勘察");
@@ -248,8 +263,13 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
             return item;
         }).collect(Collectors.toList());
-        peasantHouseholdDtoPage.setRecords(newRecords);
-        return peasantHouseholdDtoPage;
+        Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(objectPageInfo.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(newRecords);
+
+        return pagenew;
     }
 
     /**

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

@@ -173,10 +173,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             //增加人员权限
             List<String> lisk=new ArrayList<>();
             StdUserEmpower  stdUserEmpower= new StdUserEmpower();
-            //lisk.add(publicAgencyUser.getAmosOrgCode());
+
             lisk.add(re.getRegionalCompaniesCode());
             stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
             stdUserEmpower.setAmosOrgCode(lisk);
+            stdUserEmpower.setPermissionType("HYGF");
             userEmpowerMapper.insert(stdUserEmpower);
 
 
@@ -297,6 +298,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
                 stdUserEmpower=new StdUserEmpower();
                 stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
                 stdUserEmpower.setAmosOrgCode(lisk);
+                stdUserEmpower.setPermissionType("HYGF");
                 userEmpowerMapper.insert(stdUserEmpower);
             }
 
@@ -351,57 +353,92 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
         unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
         unitInfo.setAdminUserName(publicAgencyUse.getRealName());
+        unitInfoMapper.updateById(unitInfo);
+        //修改管理员
+        List<Long>  roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
+            if(roidx==null){
+                publicAgencyUsex.setRole(null);
+            }else{
+                roidx.remove(userGroupId);
+                publicAgencyUsex.setRole(JSON.toJSONString(roidx));
+            }
 
 
-        unitInfoMapper.updateById(unitInfo);
+        //修改当前用户角色权限
+        List<Long>  roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
+        if(roid==null){
+            roid=new ArrayList<>();
+        }
+        roid.add(userGroupId);
+        publicAgencyUse.setRole(JSON.toJSONString(roid));
+
+        publicAgencyUserMapper.updateById(publicAgencyUsex);
+        publicAgencyUserMapper.updateById(publicAgencyUse);
 
+        //修改平台用户
         List<String> userId = new ArrayList<>();
         userId.add(publicAgencyUse.getAmosUserId());
 
 
-        //修改新管理员
-        Privilege.groupUserClient.create(userGroupId, userId);
+
 
         //删除旧管理员
         Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
+            System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
 
+            // 1 修改平台用户
+            Privilege.groupUserClient.create(userGroupId, userId);
+            System.out.println("新增角色用户===================================:"+userId);
 
-            //修改权限
-            //旧管理员去除
-            List<String> li=null;
-            LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
-            uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUsex.getAmosUserId());
-            StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
-            li=stdUserEmpower.getAmosOrgCode();
 
-            if(stdUserEmpower!=null){
-                stdUserEmpower.setAmosOrgCode(null);
-                userEmpowerMapper.updateById(stdUserEmpower);
+//            userEmpowerMapper.upuserrole(
+//                    publicAgencyUse.getSequenceNbr(),
+//                    publicAgencyUse.getAmosUserId(),
+//                    userGroupId,
+//                    personnelBusines.getAmosUnitId()
+//            );
 
-            }else{
-                stdUserEmpower=new StdUserEmpower();
-                stdUserEmpower.setAmosOrgCode(null);
-                userEmpowerMapper.insert(stdUserEmpower);
-            }
+
+            //修改权限
+        //旧管理员去除
+        List<String> li=null;
+        LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
+        uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUsex.getAmosUserId());
+        StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
+        li=stdUserEmpower.getAmosOrgCode();
+
+        if(stdUserEmpower!=null){
+            stdUserEmpower.setAmosOrgCode(null);
+            userEmpowerMapper.updateById(stdUserEmpower);
+
+        }else{
+            stdUserEmpower=new StdUserEmpower();
+            stdUserEmpower.setAmosOrgCode(null);
+            stdUserEmpower.setPermissionType("HYGF");
+            stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
+            userEmpowerMapper.insert(stdUserEmpower);
+        }
 
 
 
 
-           //新管理员新增
-            LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
-            uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
-            StdUserEmpower  stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
+       //新管理员新增
+        LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
+        uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
+        StdUserEmpower  stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
 
 
-            if(stdUserEmpower1!=null){
-                stdUserEmpower1.setAmosOrgCode(li);
-                userEmpowerMapper.updateById(stdUserEmpower1);
+        if(stdUserEmpower1!=null){
+            stdUserEmpower1.setAmosOrgCode(li);
+            userEmpowerMapper.updateById(stdUserEmpower1);
 
-            }else{
-                stdUserEmpower1=new StdUserEmpower();
-                stdUserEmpower1.setAmosOrgCode(li);
-                userEmpowerMapper.insert(stdUserEmpower1);
-            }
+        }else{
+            stdUserEmpower1=new StdUserEmpower();
+            stdUserEmpower1.setAmosOrgCode(li);
+            stdUserEmpower1.setPermissionType("HYGF");
+            stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
+            userEmpowerMapper.insert(stdUserEmpower1);
+        }
 
 
 

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

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
@@ -100,18 +101,17 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //        }
 
         //获取用户所在经销商单位
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
-
-        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
-            serviceAgent=userUnitInformationDto.getAmosDealerName();
-        }
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
+//
+//        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
+//            serviceAgent=userUnitInformationDto.getAmosDealerName();
+//        }
 
         //return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
         return this.queryPage((int) page.getCurrent(), (int) page.getSize(),powerStationCode,ownersName,serviceAgent);
     }
 
     //查询电站审核记录
-
     public Page<PowerStationDto> queryPage(int current, int size,
             String powerStationCode,
             String ownersName,String serviceAgent)   {
@@ -326,6 +326,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     String peasantHouseholdId = powerStation.getPeasantHouseholdId();
                     PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId));
                     peasantHousehold.setSurveyOrNot(3);
+                    peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
                     peasantHouseholdService.saveOrUpdate(peasantHousehold);
                 }
             //}

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

@@ -5,15 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.DeliveryStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PreparationEnum;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyLogDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
@@ -77,29 +80,37 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     /**
      * 分页查询
      */
+
     public IPage<PreparationMoney> queryForPreparationMoneyPage(PreparationPageDto  dto)   {
 
         //列表数据组装
-        LambdaQueryWrapper<PreparationMoney> qw = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<PreparationMoney> qw = new LambdaQueryWrapper<>();
         DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-        qw.like(StringUtils.isNotEmpty(dto.getConsigneeRegion()), PreparationMoney::getConsigneeRegion, dto.getConsigneeRegion());
-        qw.like(StringUtils.isNotEmpty(dto.getAmosUnitName()), PreparationMoney::getAmosUnitName, dto.getAmosUnitName());
-        qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), PreparationMoney::getOddNumbers, dto.getOddNumbers());
-        qw.eq(StringUtils.isNotEmpty(dto.getDeliveryState()), PreparationMoney::getDeliveryState, dto.getDeliveryState());
-        qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
-        qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.已作废.getCode());
-        qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.待发货.getCode());
+//      qw.like(StringUtils.isNotEmpty(dto.getConsigneeRegion()), PreparationMoney::getConsigneeRegion, dto.getConsigneeRegion());
+//      qw.like(StringUtils.isNotEmpty(dto.getAmosUnitName()), PreparationMoney::getAmosUnitName, dto.getAmosUnitName());
+//      qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), PreparationMoney::getOddNumbers, dto.getOddNumbers());
+//      qw.eq(StringUtils.isNotEmpty(dto.getDeliveryState()), PreparationMoney::getDeliveryState, dto.getDeliveryState());
+//      qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
+//      qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.已作废.getCode());
 
          if(dto.getDeliveryTime()!=null&&!dto.getDeliveryTime().get(0).equals("")){
-             qw.between(dto.getDeliveryTime()!=null, PreparationMoney::getDeliveryTime, dto.getDeliveryTime().get(0), dto.getDeliveryTime().get(1));
+//            qw.between(dto.getDeliveryTime()!=null, PreparationMoney::getDeliveryTime, dto.getDeliveryTime().get(0), dto.getDeliveryTime().get(1));
+             dto.setDeliveryTimeStart(dto.getDeliveryTime().get(0));
+             dto.setDeliveryTimeEnd(dto.getDeliveryTime().get(1));
          }
-
-        qw.orderBy(Boolean.TRUE, Boolean.FALSE, PreparationMoney::getOrderTime);
-
-        IPage<PreparationMoney> warningQuestionInfoIPage = preparationMoneyMapper.selectPage(dto, qw);
-
-        return warningQuestionInfoIPage;
+//        qw.orderBy(Boolean.TRUE, Boolean.FALSE, PreparationMoney::getOrderTime);
+        PreparationDto preparationDto = new PreparationDto();
+        BeanUtils.copyProperties(dto,preparationDto);
+        PageHelper.startPage((int)dto.getCurrent(),(int)dto.getSize());
+        List<PreparationMoney> list = preparationMoneyMapper.selectPageList(preparationDto);
+        PageInfo<PreparationMoney> page = new PageInfo(list);
+        Page<PreparationMoney> pagenew = new Page<PreparationMoney>();
+        pagenew.setCurrent(page.getPageNum());
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(page.getSize());
+        pagenew.setRecords(page.getList());
+        return pagenew;
     }
 
     /**
@@ -299,7 +310,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
             //更新电站施工状态
             LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getConstructionState,DeliveryStateeEnum.已发货.getCode());
+            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货中.getCode());
             List<DocumentStation> idsk= model.getPeasantHouseholdId();
             List<Long> idsH=new ArrayList<>();
 
@@ -380,7 +391,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
                 //更新电站施工状态
                 LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.已收货.getCode());
+                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货完成.getCode());
                 List<DocumentStation> idsk= model.getPeasantHouseholdId();
                 List<Long> idsH=new ArrayList<>();
 
@@ -399,7 +410,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
                     //更新电站施工状态
                     LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-                    up.set(PeasantHousehold::getConstructionState,DeliveryStateeEnum.已发货.getCode());
+                    up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货中.getCode());
                     List<DocumentStation> idsk= model.getPeasantHouseholdId();
                     List<Long> idsH=new ArrayList<>();
                     for (DocumentStation documentStation : idsk) {

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
@@ -95,6 +96,8 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     private static final String IDX_REQUEST_STATE="200";
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
+    @Autowired
+    PeasantHouseholdMapper  peasantHouseholdMapper;
 
     @Autowired
     WorkOrderMapper workOrderMapper;
@@ -326,6 +329,14 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                 powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
 
                 powerStationService.savePowerStation(powerStation, true,powerStation.getOwnersName(),"");
+                //
+            LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+            up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.勘察中.getCode());
+            long idsk= basicGridAcceptance.getPeasantHouseholdId();
+            up.eq(PeasantHousehold::getSequenceNbr,idsk);
+            peasantHouseholdMapper.update(null,up);
+
+
 
         } catch (Exception e){
             e.printStackTrace();

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

@@ -32,127 +32,153 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TdHygfJpInverterWarnServiceImpl
-		extends BaseService<TdHygfJpInverterWarnDto, TdHygfJpInverterWarn, TdHygfJpInverterWarnMapper>
-		implements ITdHygfJpInverterWarnService {
+        extends BaseService<TdHygfJpInverterWarnDto, TdHygfJpInverterWarn, TdHygfJpInverterWarnMapper>
+        implements ITdHygfJpInverterWarnService {
 
-	@Autowired
-	JpStationServiceImpl jpStationServiceImpl;
+    @Autowired
+    JpStationServiceImpl jpStationServiceImpl;
 
-	@Autowired
-	HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
+    @Autowired
+    HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
 
-	/**
-	 * 分页查询
-	 */
-	public Page<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnPage(Page<TdHygfJpInverterWarnDto> pageParam,
-			TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
-		int pageNum = (int) pageParam.getCurrent();
-		int pageSize = (int) pageParam.getSize();
-		PageHelper.startPage(pageNum, pageSize);
-//		if (tdHygfJpInverterWarnDto.getState() != null) {
-//			String[] s = tdHygfJpInverterWarnDto.getState().split(",");
-//			tdHygfJpInverterWarnDto.setStates(Arrays.asList(s));
+    /**
+     * 分页查询
+     */
+    public Page<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnPage(Page<TdHygfJpInverterWarnDto> pageParam,
+                                                                          TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
+        int pageNum = (int) pageParam.getCurrent();
+        int pageSize = (int) pageParam.getSize();
+        PageHelper.startPage(pageNum, pageSize);
+        if (tdHygfJpInverterWarnDto.getState() != null) {
+            String[] s = tdHygfJpInverterWarnDto.getState().split(",");
+            tdHygfJpInverterWarnDto.setStates(Arrays.asList(s));
+        }
+        if (tdHygfJpInverterWarnDto.getStationName() != null) {
+            LambdaQueryWrapper<JpStation> wapper = new LambdaQueryWrapper<JpStation>().like(JpStation::getName,
+                    tdHygfJpInverterWarnDto.getStationName());
+            if (!tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
+                wapper.in(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getStationIds());
+            }
+            List<JpStation> sList = jpStationServiceImpl.list(wapper);
+            List<String> ids = sList.stream().map(i -> i.getThirdStationId()).collect(Collectors.toList());
+            tdHygfJpInverterWarnDto.setStationIds(ids);
+        }
+//				if (tdHygfJpInverterWarnDto.getHandlerStatus() != null) {
+//			String[] s = tdHygfJpInverterWarnDto.getHandlerStatus().split(",");
+//			tdHygfJpInverterWarnDto.setListHandlerStatus(Arrays.asList(s));
 //		}
-		if (tdHygfJpInverterWarnDto.getStationName() != null) {
-			LambdaQueryWrapper<JpStation> wapper = new LambdaQueryWrapper<JpStation>().like(JpStation::getName,
-					tdHygfJpInverterWarnDto.getStationName());
-			if (!tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
-				wapper.in(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getStationIds());
-			}
-			List<JpStation> sList = jpStationServiceImpl.list(wapper);
-			List<String> ids = sList.stream().map(i -> i.getThirdStationId()).collect(Collectors.toList());
-			tdHygfJpInverterWarnDto.setStationIds(ids);
-		}
-				if (tdHygfJpInverterWarnDto.getHandlerStatus() != null) {
-			String[] s = tdHygfJpInverterWarnDto.getHandlerStatus().split(",");
-			tdHygfJpInverterWarnDto.setListHandlerStatus(Arrays.asList(s));
-		}
-		List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
-		if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
-			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
-		} else {
+        List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
+        if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
 
-			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
+        } else {
 
-			if (!list.isEmpty()) {
-				list.forEach(i -> {
-					JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
-							.eq(JpStation::getThirdStationId, i.getThirdStationId()));
-					if (jpStation != null) {
-						i.setAddress(jpStation.getAddress());
-						i.setStationName(jpStation.getName());
-						i.setArea(jpStation.getArea());
-					}
-					if (i.getStartTime() != null) {
-						i.setStartTimeFormat(TimeUtil.dateFormat(i.getStartTime()));
-					}
-				});
-			}
-		}
-		PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
-		com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();
-		pagenew.setCurrent(pageNum);
-		pagenew.setTotal(page.getTotal());
-		pagenew.setSize(pageSize);
-		pagenew.setRecords(page.getList());
-		return pagenew;
-	}
+            list = this.baseMapper.list(tdHygfJpInverterWarnDto);
 
-	/**
-	 * 列表查询 示例
-	 */
-	public List<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnList() {
-		return this.getBaseMapper().listAll();
-	}
+            if (!list.isEmpty()) {
+                list.forEach(i -> {
+                    JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+                            .eq(JpStation::getThirdStationId, i.getThirdStationId()));
+                    if (jpStation != null) {
+                        i.setAddress(jpStation.getAddress());
+                        i.setStationName(jpStation.getName());
+                        i.setArea(jpStation.getArea());
+                    }
+                    if (i.getStartTime() != null) {
+                        i.setStartTimeFormat(TimeUtil.dateFormat(i.getStartTime()));
+                    }
+                });
+            }
+        }
+        List<Long> waringIds = list.stream().map(tdHygfJpInverterWarnDto1 -> tdHygfJpInverterWarnDto1.getCreatedTime()).collect(Collectors.toList());
+        if (waringIds.size() == 0) {
+            waringIds = Arrays.asList(0L);
+        }
+        List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id", waringIds));
+        if (hygfMaintenanceTicketsList.size() > 0) {
+           list.forEach(i -> {
+               List<HYGFMaintenanceTickets> ticketsList = hygfMaintenanceTicketsList.stream().filter(hygfmaintenanceTickets -> i.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).collect(Collectors.toList());
+               if (ObjectUtil.isNotEmpty(ticketsList)) {
+                   Set<String> status = ticketsList.stream().map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
+                   if (status.contains("未处理")) {
+                       i.setTicketStatus("处理中");
+                   }
+                   if (status.contains("已处理") && status.size() == 1) {
+                       i.setTicketStatus("已处理");
+                   }
+               }
+           });
+        }
+        PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();
+        pagenew.setCurrent(pageNum);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(pageSize);
+        pagenew.setRecords(page.getList());
+        return pagenew;
+    }
 
-	public TdHygfJpInverterWarnDto queryByCreatedTime(long createdTime) {
-		Map map = new HashMap<>();
-		map.put("created_time", createdTime);
-		TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto = this.baseMapper.getByTime(createdTime);
-		JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
-				.eq(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getThirdStationId()));
-		List<HYGFMaintenanceTickets> hygfMaintenanceTickets = hygfMaintenanceTicketsMapper.
-				selectList(new QueryWrapper<HYGFMaintenanceTickets>()
-						.eq("warning_id",String.valueOf(tdHygfJpInverterWarnDto.getCreatedTime()))
-						.eq("inverter_sn",String.valueOf(tdHygfJpInverterWarnDto.getSnCode())));
-		if (jpStation != null) {
-			tdHygfJpInverterWarnDto.setStationName(jpStation.getName());
-			tdHygfJpInverterWarnDto.setStationContact(jpStation.getStationContact());
-			tdHygfJpInverterWarnDto.setUserName(jpStation.getUserName());
-			tdHygfJpInverterWarnDto.setUserPhone(jpStation.getUserPhone());
-			tdHygfJpInverterWarnDto.setEmail(jpStation.getEmail());
-			tdHygfJpInverterWarnDto.setAddress(jpStation.getAddress());
-			tdHygfJpInverterWarnDto.setArea(jpStation.getArea());
-			if (tdHygfJpInverterWarnDto.getRecoverTime() != null) {
-				tdHygfJpInverterWarnDto
-						.setRecoverTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getRecoverTime()));
-				tdHygfJpInverterWarnDto.setTimeLongFormat(TimeUtil
-						.longFormat(tdHygfJpInverterWarnDto.getRecoverTime() - tdHygfJpInverterWarnDto.getStartTime()));
-			}
-			if (tdHygfJpInverterWarnDto.getStartTime() != null) {
-				tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
-			}
-		}
-		if(hygfMaintenanceTickets.size()>0){
-			HYGFMaintenanceTickets hygfMaintenanceTickets1 =hygfMaintenanceTickets.get(0);
-			BeanUtil.copyProperties(hygfMaintenanceTickets1,tdHygfJpInverterWarnDto, "handlerStatus");
-		}
-		return tdHygfJpInverterWarnDto;
-	}
+    /**
+     * 列表查询 示例
+     */
+    public List<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnList() {
+        return this.getBaseMapper().listAll();
+    }
 
-	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus){
-	     List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size,handlerStatus);
-		 list.forEach(i -> {
-			 JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
-					.eq(JpStation::getThirdStationId, i.getThirdStationId()));
-			 if(ObjectUtil.isNotNull(jpStation)){
-				 i.setAddress(jpStation.getAddress());
-		         i.setArea(jpStation.getArea());
-			 }
-		 });
-		return list;
-	}
-	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content,String handlerStatus){
-		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus);
-	}
+    public TdHygfJpInverterWarnDto queryByCreatedTime(long createdTime) {
+        Map map = new HashMap<>();
+        map.put("created_time", createdTime);
+        TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto = this.baseMapper.getByTime(createdTime);
+        JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+                .eq(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getThirdStationId()));
+        List<HYGFMaintenanceTickets> hygfMaintenanceTickets = hygfMaintenanceTicketsMapper.
+                selectList(new QueryWrapper<HYGFMaintenanceTickets>()
+                        .eq("warning_id", String.valueOf(tdHygfJpInverterWarnDto.getCreatedTime()))
+                        .eq("inverter_sn", String.valueOf(tdHygfJpInverterWarnDto.getSnCode())));
+        if (jpStation != null) {
+            tdHygfJpInverterWarnDto.setStationName(jpStation.getName());
+            tdHygfJpInverterWarnDto.setStationContact(jpStation.getStationContact());
+            tdHygfJpInverterWarnDto.setUserName(jpStation.getUserName());
+            tdHygfJpInverterWarnDto.setUserPhone(jpStation.getUserPhone());
+            tdHygfJpInverterWarnDto.setEmail(jpStation.getEmail());
+            tdHygfJpInverterWarnDto.setAddress(jpStation.getAddress());
+            tdHygfJpInverterWarnDto.setArea(jpStation.getArea());
+            if (tdHygfJpInverterWarnDto.getRecoverTime() != null) {
+                tdHygfJpInverterWarnDto
+                        .setRecoverTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getRecoverTime()));
+                tdHygfJpInverterWarnDto.setTimeLongFormat(TimeUtil
+                        .longFormat(tdHygfJpInverterWarnDto.getRecoverTime() - tdHygfJpInverterWarnDto.getStartTime()));
+            }
+            if (tdHygfJpInverterWarnDto.getStartTime() != null) {
+                tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
+            }
+        }
+        if (hygfMaintenanceTickets.size() > 0) {
+            Set<String> status = hygfMaintenanceTickets.stream().filter(hygfmaintenanceTickets -> tdHygfJpInverterWarnDto.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
+            if (status.contains("未处理")) {
+                tdHygfJpInverterWarnDto.setTicketStatus("处理中");
+            }
+            if (status.contains("已处理") && status.size() == 1) {
+                tdHygfJpInverterWarnDto.setTicketStatus("已处理");
+            }
+            tdHygfJpInverterWarnDto.setListTickets(hygfMaintenanceTickets);
+        }
+        return tdHygfJpInverterWarnDto;
+    }
+
+    public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size, String handlerStatus) {
+        List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, (current - 1) * size, size, handlerStatus);
+        list.forEach(i -> {
+            JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+                    .eq(JpStation::getThirdStationId, i.getThirdStationId()));
+            if (ObjectUtil.isNotNull(jpStation)) {
+                i.setAddress(jpStation.getAddress());
+                i.setArea(jpStation.getArea());
+            }
+        });
+        return list;
+    }
+
+    public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus) {
+        return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus);
+    }
 }
\ 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/UnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -129,6 +130,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
     @Autowired
     UserEmpowerMapper userEmpowerMapper;
+
+    private  static final  String SMSTEMPCODENO="SMS_HYGF_0003";
+
+    private  static final  String SMSTEMPCODEYES="SMS_HYGF_0004";
     /**
      * 分页查询
      */
@@ -571,9 +576,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                     String meg= String.valueOf(kv.get("approveInfo"));
                     params.put("code","不通过");
                     params.put("mobile",unitInfo.getAdminPhone());
-                    params.put("smsCode", smsTempCode);
+                    params.put("smsCode", SMSTEMPCODENO);
                     approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
                     FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+                    System.out.println("短信通知============================"+JSON.toJSONString(date));
                 }else{
                     // 1. 更新经销商状态
                     unitInfo.setAuditStatus(2);
@@ -614,10 +620,18 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                     StdUserEmpower  stdUserEmpower=new StdUserEmpower();
                     stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
                     stdUserEmpower.setAmosOrgCode(lis);
+                    stdUserEmpower.setPermissionType("HYGF");
                     userEmpowerMapper.insert(stdUserEmpower);
 
                     // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
                     approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
+                    HashMap<String, String> params = new HashMap<>(3);
+                    params.put("code","通过");
+                    params.put("mobile",unitInfo.getAdminPhone());
+                    params.put("smsCode", SMSTEMPCODEYES);
+                    FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+                    System.out.println("短信通知============================"+JSON.toJSONString(date));
+
                 }
             }
             // 2. 更新流程状态
@@ -641,11 +655,11 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
             dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
 
+            this.saveOrUpdate(unitInfo);
 
 
 
 
-            this.saveOrUpdate(unitInfo);
         }catch (Exception e){
 
             if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) {
@@ -921,7 +935,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
        uo.eq(StdUserEmpower::getAmosUserId,unitInfo.getAdminUserId());
        StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
-//       lisk.add(unitInfo.getAmosCompanyCode());
+
        if(stdUserEmpower!=null){
            stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
            stdUserEmpower.setAmosOrgCode(lisk);
@@ -930,6 +944,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
            stdUserEmpower=new StdUserEmpower();
            stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
            stdUserEmpower.setAmosOrgCode(lisk);
+           stdUserEmpower.setPermissionType("HYGF");
            userEmpowerMapper.insert(stdUserEmpower);
        }
 
@@ -980,8 +995,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                               String peasantHouseholdNo,
                               String ownersName,
                               String ids){
+       UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
         PageHelper.startPage(pageNum, pageSize);
-        UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
         List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids);
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
@@ -92,6 +93,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
     WorkflowFeignClient workflowFeignClient;
 
 
+    @Autowired
+    PeasantHouseholdMapper peasantHouseholdMapper;
 
     /**
      * 分页查询
@@ -282,6 +285,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
              up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.施工中.getCode());
          }else{
              up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待登记.getCode());
+
+             WorkOrderPowerStation basicGridAcceptanc= workOrderPowerStationMapper.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
+             //施工完成
+             LambdaUpdateWrapper<PeasantHousehold>  up1 =new LambdaUpdateWrapper<>();
+             up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+             long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+             up1.eq(PeasantHousehold::getSequenceNbr,idsk);
+             peasantHouseholdMapper.update(null,up1);
+
          }
             workOrderPowerStationMapper.update(null,up);
             //修改派工单状态

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev220.properties

+## DB properties:
+spring.datasource.dynamic.primary= mysql-service
+spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.mysql-service.jdbc-url=jdbc:mysql://172.16.10.220:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.mysql-service.username=root
+spring.datasource.mysql-service.password=Yeejoin@2020
+spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
+#最小连接
+spring.datasource.mysql-service.minimum-idle: 5
+#最大连接
+spring.datasource.mysql-service.maximum-pool-size: 15
+#自动提交
+spring.datasource.mysql-service.auto-commit: true
+#最大空闲时常
+spring.datasource.mysql-service.idle-timeout: 30000
+#连接池名
+spring.datasource.mysql-service.pool-name: MysqlDruidCP
+#最大生命周期
+spring.datasource.mysql-service.max-lifetime: 1800000
+#连接超时时间
+spring.datasource.mysql-service.connection-timeout: 30000
+
+
+
+spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
+spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://47.92.234.253:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
+spring.datasource.tdengine-service.username=root
+spring.datasource.tdengine-service.password=taosdata
+spring.datasource.tdengine-service.type=com.zaxxer.hikari.HikariDataSource
+#最小连接
+spring.datasource.tdengine-service.minimum-idle: 5
+#最大连接
+spring.datasource.tdengine-service.maximum-pool-size: 15
+#自动提交
+spring.datasource.tdengine-service.auto-commit: true
+#最大空闲时常
+spring.datasource.tdengine-service.idle-timeout: 30000
+#连接池名
+spring.datasource.tdengine-service.pool-name: Data_trans_HikariCP
+#最大生命周期
+spring.datasource.tdengine-service.max-lifetime: 1800000
+#连接超时时间
+spring.datasource.tdengine-service.connection-timeout: 30000
+
+spring.datasource.tdengine-service.connection-test-query: SELECT 1
+
+
+
+
+
+
+## eureka properties:
+eureka.instance.hostname=172.16.10.220
+eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
+## redis properties:
+spring.redis.database=1
+spring.redis.host=172.16.10.220
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+
+
+spring.cache.type=GENERIC
+j2cache.open-spring-cache=true
+j2cache.cache-clean-mode=passive
+j2cache.allow-null-values=true
+j2cache.redis-client=lettuce
+j2cache.l2-cache-open=true
+j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
+j2cache.L1.provider_class=caffeine
+j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
+j2cache.L2.config_section=lettuce
+j2cache.sync_ttl_to_redis=true
+j2cache.default_cache_null_object=false
+j2cache.serialization=fst
+caffeine.properties=/caffeine.properties
+lettuce.mode=single
+lettuce.namespace=
+lettuce.storage=generic
+lettuce.channel=j2cache
+lettuce.scheme=redis
+lettuce.hosts=${spring.redis.host}:${spring.redis.port}
+lettuce.password=${spring.redis.password}
+lettuce.database=${spring.redis.database}
+lettuce.sentinelMasterId=
+lettuce.maxTotal=100
+lettuce.maxIdle=10
+lettuce.minIdle=10
+lettuce.timeout=10000
+
+
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://47.92.234.253:1883
+emqx.user-name=admin
+emqx.password=public
+emqx.max-inflight=1000
+
+
+spring.influx.url=http://47.92.234.253:8086
+spring.influx.password=Yeejoin@2020
+spring.influx.user=root
+spring.influx.database=iot_platform
+spring.influx.retention_policy=default
+spring.influx.retention_policy_time=30d
+spring.influx.actions=10000
+spring.influx.bufferLimit=20000
+
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+management.security.enabled=true
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+
+fire-rescue=123
+
+mybatis-plus.global-config.db-config.update-strategy=ignored
+
+# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
+amos.secret.key=qaz
+# if your service can't be access ,you can use this setting , you need change ip as your.
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address=172.16.3.122
+spring.activemq.broker-url=tcp://47.92.234.253:61616
+spring.activemq.user=admin
+spring.activemq.password=admin
+spring.jms.pub-sub-domain=false
+myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
+
+regulator.unit.code=86*258
+# ������Ӧ��code
+dealer.appcode=studio_normalapp_5133538
+
+hygf.sms.tempCode=SMS_HYGF_0001
+
+# �������������
+sms.huawei.url=https://smsapi.cn-north-4.myhuaweicloud.com:443/sms/batchSendSms/v1
+sms.huawei.appKey=n3FYPWO7Heo1ze212QRBvF4VA2E2
+sms.huawei.appSecret=IFhiMpWROi7w4Ei21ZbfIjKyt97b
+# ģ��id
+sms.huawei.templateId=67931857f6f74e119fadc429bc25a531
+# ǩ��ͨ����
+sms.huawei.sender=1069368924410006092
+# 签名名称
+sms.huawei.signature=江西电建
+
+# 锟斤拷站锟斤拷锟絧ageId
+power.station.examine.pageId=1680853427061551106
+# 锟斤拷站锟斤拷思苹锟絠d
+power.station.examine.planId=c4ed1873-0dc6-4518-a7a9-dbc588ef35e5
+
+
+unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
+
+hygf.sms.tempCodeJXS=SMS_HYGF_0002
+
+#工程角色id
+hygf.role.gc.roleSeq=1702550832882413570
+
+# 锟矫伙拷锟斤拷userGroupId
+hygf.user.group.id=1702512164058718210
+
+#锟斤拷锟斤拷司
+regionalCompanies.company.seq=1701778292098498561
+
+
+
+#qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
+#qiyuesuo.accessKey = a1lcd3WRRV
+#qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
+#qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
+
+
+qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
+qiyuesuo.accessKey = QcmHQu55pl
+qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
+qiyuesuo.secretKey=B6OYbHyfXikAghB2
+
+
+
+# ============================================= v20230821 add properties =============================================
+security.productWeb=AMOS_STUDIO_WEB
+security.appKey=AMOS_STUDIO
+
+login.environment=dev
+# 锟斤拷锟脚╋拷锟轿拷锟叫★拷锟斤拷锟斤拷锟斤拷?
+hygfProgram.appid=wx0a2b054a237a3b34
+hygfProgram.secret=5fc6af660920f6211b1b69bc9c451b09
+# 默锟斤拷微锟斤拷小锟斤拷锟斤拷农锟斤拷锟斤拷锟斤拷锟斤拷
+farmer.orgCode=86
+#农锟斤拷锟斤拷锟斤拷锟斤拷位
+farmer.sequenceNbr=1703583838279593985
+farmer.orgNamesWithoutRole=
+#农锟斤拷锟斤拷色
+farmer.roleId=1702551322030534658
+# 锟斤拷锟矫接匡拷锟斤拷权锟矫伙拷
+platform.access.loginId=hygf_platform
+platform.access.password=AC286A35E74D2DD281EB979789DECF3A
+# 锟斤拷锟斤拷锟矫的撅拷锟斤拷锟斤拷userid
+dealer.userId=
+# 锟斤拷锟皆碉拷时锟斤拷默锟斤拷锟斤拷锟斤拷
+farmer.registerPassword=a123456
+
+#锟斤拷锟斤拷锟教碉拷位锟斤拷锟节碉拷id
+dealer.managementUnitId=1702211822385393665
+#锟斤拷锟斤拷锟教癸拷锟斤拷员锟斤拷色
+dealer.roleId=1702512164058718210
+
+#锟斤拷询锟斤拷锟斤拷锟斤拷锟矫伙拷锟斤拷
+dealer.group=1702511386875158529
+
+#锟斤拷锟矫癸拷锟斤拷锟斤拷探锟斤拷?
+
+dealer.engineering=1702512052154687489
+
+#锟斤拷时锟斤拷锟斤拷锟饺★拷锟斤拷锟斤拷锟较?
+cheduled.crons=0 10 0 * * ?
+
+
+dealer.appcode.manage=studio_normalapp_5155413,studio_normalapp_5133538
+dealer.appcode.role=1767363928842571777
+dealer.amosDealerId=1767820997374775298
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/logback-dev220.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+<property name="LOG_HOME" value="log" />
+<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+<!-- 按照每天生成日志文件 -->
+<appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <!--日志文件输出的文件名-->
+        <FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+        <!--日志文件保留天数-->
+        <MaxHistory>7</MaxHistory>
+    </rollingPolicy>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <pattern>${LOG_PATTERN}</pattern>
+    </encoder>
+    <!--日志文件最大的大小-->
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+        <MaxFileSize>30mb</MaxFileSize>
+    </triggeringPolicy>
+</appender>
+<!-- 控制台输出 -->
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <pattern>${LOG_PATTERN}</pattern>
+    </encoder>
+</appender>
+<!--myibatis log configure-->
+<logger name="com.apache.ibatis" level="DEBUG"/>
+<logger name="java.sql.Connection" level="DEBUG"/>
+<logger name="java.sql.Statement" level="DEBUG"/>
+<logger name="java.sql.PreparedStatement" level="DEBUG"/>
+<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+<logger name="org.springframework" level="DEBUG"/>
+<logger name="org.typroject" level="DEBUG"/>
+<logger name="com.yeejoin" level="DEBUG"/>
+<!-- 日志输出级别 -->
+<root level="INFO">
+    <appender-ref ref="FILE" />
+    <appender-ref ref="STDOUT" />
+</root>
+
+</configuration>