功能调整

@@ -106,4 +106,5 @@ public class No_3_1Dto {
 
 
 
+
 }

@@ -72,4 +72,5 @@ public class LoadParameterVo {
 
     @ApiModelProperty("每天供冷小时数")
     private Double coolingHoursPerDay;
+
 }

@@ -476,7 +476,9 @@ public class MyServiceImpl implements MyService {
                     .eq(Synthesize_no_1::getDeleteState, "3")
                     .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                     .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                    .orderByDesc(Synthesize_no_1::getTime));
+                    .orderByDesc(Synthesize_no_1::getAdminState)
+                    .orderByDesc(Synthesize_no_1::getPtState)
+            );
             for (Synthesize_no_1 record : iPage.getRecords()) {
                 record.setUserId(user.getName());
             }
@@ -495,7 +497,9 @@ public class MyServiceImpl implements MyService {
                     .in(Synthesize_no_1::getUserId, list2)
                     .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                     .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                    .orderByDesc(Synthesize_no_1::getTime));
+                    .orderByDesc(Synthesize_no_1::getAdminState)
+                    .orderByDesc(Synthesize_no_1::getPtState)
+            );
             for (Synthesize_no_1 record : iPage.getRecords()) {
                 User user1 = userMapper.selectById(record.getUserId());
                 if (!user.getId().equals(user1.getId())) {
@@ -516,7 +520,9 @@ public class MyServiceImpl implements MyService {
                         .eq(Synthesize_no_1::getDeleteState, "3")
                         .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                         .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                        .orderByDesc(Synthesize_no_1::getTime));
+                        .orderByDesc(Synthesize_no_1::getAdminState)
+                        .orderByDesc(Synthesize_no_1::getPtState)
+                );
                 if (!iPage.getRecords().isEmpty()) {
                     for (Synthesize_no_1 record : iPage.getRecords()) {
                         User user1 = userMapper.selectById(record.getUserId());
@@ -536,7 +542,9 @@ public class MyServiceImpl implements MyService {
                         .eq(Synthesize_no_1::getUserId, user.getId())
                         .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                         .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                        .orderByDesc(Synthesize_no_1::getTime));
+                        .orderByDesc(Synthesize_no_1::getAdminState)
+                        .orderByDesc(Synthesize_no_1::getPtState)
+                );
                 if (!iPage.getRecords().isEmpty()) {
                     for (Synthesize_no_1 record : iPage.getRecords()) {
                         User user1 = userMapper.selectById(record.getUserId());
@@ -565,7 +573,9 @@ public class MyServiceImpl implements MyService {
                             .in(Synthesize_no_1::getUserId, list2)
                             .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                             .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                            .orderByDesc(Synthesize_no_1::getTime));
+                            .orderByDesc(Synthesize_no_1::getAdminState)
+                            .orderByDesc(Synthesize_no_1::getPtState)
+                    );
                     if (!iPage.getRecords().isEmpty()) {
                         for (Synthesize_no_1 record : iPage.getRecords()) {
                             User user1 = userMapper.selectById(record.getUserId());

@@ -79,7 +79,10 @@ public class No_1ServiceImpl extends ServiceImpl<No_1Mapper, Synthesize_no_1> im
                 IPage<Synthesize_no_1> page1 = no_1Service.page(synthesize_no_1Page, new LambdaQueryWrapper<Synthesize_no_1>()
                         .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                         .eq(Synthesize_no_1::getType, "1").eq(Synthesize_no_1::getUserId, user.getId()).eq(Synthesize_no_1::getDeleteState, "3")
-                        .orderByDesc(Synthesize_no_1::getSuperAdminState).orderByDesc(Synthesize_no_1::getTime)
+                        .orderByDesc(Synthesize_no_1::getSuperAdminState)
+                        .orderByDesc(Synthesize_no_1::getAdminState)
+                        .orderByDesc(Synthesize_no_1::getPtState)
+                        .orderByDesc(Synthesize_no_1::getTime)
                 );
                 for (Synthesize_no_1 record : page1.getRecords()) {
                     record.setUserId(user.getName());
@@ -106,7 +109,9 @@ public class No_1ServiceImpl extends ServiceImpl<No_1Mapper, Synthesize_no_1> im
                 IPage<Synthesize_no_1> page2 = no_1Service.page(synthesize_no_1Page1, new LambdaQueryWrapper<Synthesize_no_1>()
                         .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                         .eq(Synthesize_no_1::getType, "1").in(Synthesize_no_1::getUserId, list2).eq(Synthesize_no_1::getDeleteState, "3")
-                        .orderByDesc(Synthesize_no_1::getSuperAdminState).orderByDesc(Synthesize_no_1::getTime)
+                        .orderByDesc(Synthesize_no_1::getSuperAdminState)
+                        .orderByDesc(Synthesize_no_1::getAdminState)
+                        .orderByDesc(Synthesize_no_1::getPtState)
                 );
                 for (Synthesize_no_1 record : page2.getRecords()) {
                     User user1 = userMapper.selectById(record.getUserId());
@@ -137,7 +142,9 @@ public class No_1ServiceImpl extends ServiceImpl<No_1Mapper, Synthesize_no_1> im
                             .eq(Synthesize_no_1::getType, "1")
                             .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                             .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                            .orderByDesc(Synthesize_no_1::getTime));
+                            .orderByDesc(Synthesize_no_1::getAdminState)
+                            .orderByDesc(Synthesize_no_1::getPtState)
+                    );
                     if (!iPage.getRecords().isEmpty()) {
                         for (Synthesize_no_1 record : iPage.getRecords()) {
                             User user1 = userMapper.selectById(record.getUserId());
@@ -159,7 +166,9 @@ public class No_1ServiceImpl extends ServiceImpl<No_1Mapper, Synthesize_no_1> im
                             .eq(Synthesize_no_1::getType, "1")
                             .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                             .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                            .orderByDesc(Synthesize_no_1::getTime));
+                            .orderByDesc(Synthesize_no_1::getAdminState)
+                            .orderByDesc(Synthesize_no_1::getPtState)
+                    );
                     if (!iPage.getRecords().isEmpty()) {
                         for (Synthesize_no_1 record : iPage.getRecords()) {
                             User user1 = userMapper.selectById(record.getUserId());
@@ -191,7 +200,9 @@ public class No_1ServiceImpl extends ServiceImpl<No_1Mapper, Synthesize_no_1> im
                                 .in(Synthesize_no_1::getUserId, list5)
                                 .like(!StringUtils.isEmpty(name), Synthesize_no_1::getProjectName, name)
                                 .orderByDesc(Synthesize_no_1::getSuperAdminState)
-                                .orderByDesc(Synthesize_no_1::getTime));
+                                .orderByDesc(Synthesize_no_1::getAdminState)
+                                .orderByDesc(Synthesize_no_1::getPtState)
+                        );
                         if (!iPage.getRecords().isEmpty()) {
                             for (Synthesize_no_1 record : iPage.getRecords()) {
                                 User user1 = userMapper.selectById(record.getUserId());

@@ -104,7 +104,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M
                                 computeArgDto.setNamType("单位投资成本");
                                 computeArgDto.setId(21);
                                 computeArgDto.setModelType(synthesize_no_2_6.getNo21());
-                                computeArgDto.setName("元/Wh");
+                                computeArgDto.setName("元/W");
                                 computeArgDtos.add(computeArgDto);
                                 ComputeArgDto computeArgDto1 = new ComputeArgDto();
                                 computeArgDto1.setId(22);

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file