Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IFlowableApi.java

@@ -17,11 +17,11 @@ import java.util.Map;
 @FeignClient(contextId = "flowableApi", name = AppNameConstants.APP_FLOWABLE_SERVICE, fallbackFactory = FlowableApiFallbackFactory.class)
 public interface IFlowableApi {
 
-    @GetMapping("/flowable/task/historicTaskList3")
-    Map historicTaskList3(String procInsId);
+    @RequestMapping(value = "/flowable/task/historicTaskList3", method = RequestMethod.POST)
+    Map historicTaskList3(@RequestParam(value = "procInsId")String procInsId);
 
-    @GetMapping("/flowable/task/historicTaskList2")
-    Map historicTaskList2(String procInsId);
+    @RequestMapping(value = "/flowable/task/historicTaskList2", method = RequestMethod.POST)
+    Map historicTaskList2(@RequestParam(value = "procInsId")String procInsId);
 
     /**
      * 根据通知信息查询数据

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -79,6 +79,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             }
 
             @Override
+            public List<UserDTO> getAllUserInfo() {
+                return null;
+            }
+
+            @Override
             public List <UserDTO> findListFlowAbleByPostId(String postId) {
                 return Lists.newArrayList ( );
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -112,6 +112,14 @@ public interface IUserApi {
     List <UserDTO> findListByPostId(@RequestParam("postId") String postId);
 
     /**
+     * 获取所有的用户信息
+     *
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/getAllUserInfo")
+    List <UserDTO> getAllUserInfo();
+
+    /**
      * 根据岗位id获取用户列表
      *
      * @param postId

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/controller/ProjectListController.java

@@ -332,8 +332,16 @@ public class ProjectListController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
+
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -346,12 +354,21 @@ public class ProjectListController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"一级校审.doc");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"一级校审.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"一级校审.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
 
@@ -370,8 +387,15 @@ public class ProjectListController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -384,12 +408,20 @@ public class ProjectListController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"二级校审.doc");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"二级校审.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"二级校审.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
 
@@ -408,8 +440,15 @@ public class ProjectListController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -422,12 +461,20 @@ public class ProjectListController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"三级校审.doc");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"三级校审.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"三级校审.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
 
@@ -446,8 +493,15 @@ public class ProjectListController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -460,12 +514,20 @@ public class ProjectListController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"资产评估项目（校对）审核记录表.xls");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"资产评估项目（校对）审核记录表.xls");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"资产评估项目（校对）审核记录表.xls");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
 
@@ -484,8 +546,15 @@ public class ProjectListController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -498,12 +567,20 @@ public class ProjectListController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"评估报告装订后浏览审核记录表.xls");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"评估报告装订后浏览审核记录表.xls");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"评估报告装订后浏览审核记录表.xls");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
     }
@@ -521,8 +598,15 @@ public class ProjectListController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -535,12 +619,20 @@ public class ProjectListController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"报告签发单.doc");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"报告签发单.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"报告签发单.doc");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -70,6 +70,7 @@ public class CwFinanceInvoiceController {
     public ResponseEntity<IPage<CwFinanceInvoiceDTO>> data(CwFinanceInvoiceDTO cwFinanceInvoiceDTO, Page<CwFinanceInvoiceDTO> page) throws Exception {
         IPage<CwFinanceInvoiceDTO> result = new Page<CwFinanceInvoiceDTO>();
         result = cwFinanceInvoiceService.findList (page, cwFinanceInvoiceDTO);
+        System.out.println("当前时间1："+System.currentTimeMillis());
         result.getRecords().stream().forEach(i -> {
             // 发票申请
             if (StringUtils.isNotBlank(i.getTaskId()) && StringUtils.isNotBlank(i.getStatus())) {
@@ -84,6 +85,7 @@ public class CwFinanceInvoiceController {
                 }
             }
         });
+        System.out.println("当前时间2："+System.currentTimeMillis());
         return ResponseEntity.ok (result);
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -89,30 +89,16 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
     public IPage<CwProjectRecordsDTO> findList(Page<CwProjectRecordsDTO> page, CwProjectRecordsDTO cwProjectRecordsDTO) throws Exception{
         QueryWrapper<CwProjectRecords> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwProjectRecordsWrapper.INSTANCE.toEntity(cwProjectRecordsDTO), CwProjectRecords.class );
         queryWrapper.eq("a.del_flag","0");
-//        queryWrapper.orderByDesc("a.create_date");
         if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
             if (ArrayUtil.isNotEmpty(cwProjectRecordsDTO.getCreateDates())) {
                 queryWrapper.between("a.create_time", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName())) {
                 queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
-//                UserDTO user = SpringUtil.getBean ( IUserApi.class ).getById(cwProjectRecordsDTO.getProjectMasterName());
-//                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
-//                if (CollectionUtils.isNotEmpty(userList)){
-//                    List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
-//                    if (CollectionUtil.isNotEmpty(ids)) {
-//                        queryWrapper.in("a.project_master_id", ids);
-//                    } else {
-//                        return new Page<>();
-//                    }
-//                } else {
-//                    queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
-//                }
 
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName2())) {
                 List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getProjectMasterName2());
-//                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
                 if (CollectionUtils.isNotEmpty(userList)){
                     List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                     if (CollectionUtil.isNotEmpty(ids)) {
@@ -126,13 +112,6 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
                 queryWrapper.in("a.real_header", cwProjectRecordsDTO.getRealHeaderName());
-//                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getRealHeaderName());
-//                List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
-//                if (CollectionUtil.isNotEmpty(ids)) {
-//                    queryWrapper.in("a.real_header", ids);
-//                } else {
-//                    return new Page<>();
-//                }
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateId())){
                 queryWrapper.eq("a.create_by_id", cwProjectRecordsDTO.getCreateId());
@@ -140,6 +119,40 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         }
 
         IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page, queryWrapper);
+        List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
+        list.getRecords().forEach(li->{
+            if (StringUtils.isBlank(li.getProjectMasterName())){
+                //根据项目经理1的id去查项目经理去名称
+                if (StringUtils.isNotBlank(li.getProjectMasterId())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMasterId().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMasterName(projectMasterName);
+                    }
+                }
+            }
+            if (StringUtils.isBlank(li.getRealHeaderName())) {
+                if (StringUtils.isNotBlank(li.getRealHeader())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getRealHeader().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setRealHeaderName(projectMasterName);
+                    }
+                }
+            }
+        });
         return list;
     }
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -91,11 +91,14 @@ public class CwProjectReportController {
     @ApiLog(value = "签章附件保存", type = LogTypeEnum.SAVE)
     @PostMapping("saveSignFiles")
     public ResponseEntity saveSignFiles(@RequestBody CwProjectReportData reportData) {
+        System.out.println("进入controller前");
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         if (CollectionUtil.isEmpty(reportData.getCwFileInfoList())) {
             reportData.setCwFileInfoList(new ArrayList<>());
         }
+        System.out.println("进入controller中");
         projectReportService.updateSignatureFiles(reportData.getCwFileInfoList(),userDTO,reportData.getId());
+        System.out.println("进入controller后");
         return ResponseEntity.ok("操作成功");
     }
 
@@ -204,8 +207,15 @@ public class CwProjectReportController {
 
         //模板对象
         Template template=null;
+        //下载文件地址
+        String filePath = null;
+        if(System.getProperty("os.name").toLowerCase().contains("win")){
+            filePath = this.getClass().getResource("/").getPath()+"/freemarker";
+        }else{
+            filePath = "/mnt/project/cloud/freemarker";
+        }
         //freemaker模板路径
-        File path = new File(this.getClass().getResource("/").getPath()+"/freemarker");
+        File path = new File(filePath);
         Configuration cfg = new Configuration();
         try {
             cfg.setDirectoryForTemplateLoading(path);
@@ -218,12 +228,20 @@ public class CwProjectReportController {
         } catch (IOException e) {
             e.printStackTrace();
         }finally {
-            //获取tomcat的路径
-            String tomcatFilePath=System.getProperty("catalina.home");
-            //删除tomcat目录下的处理后的文件信息
-            File tomcatFile = new File(tomcatFilePath+"/bin/"+"报告审核单.xls");
-            if (tomcatFile.isFile()) {
-                tomcatFile.delete();
+            if(System.getProperty("os.name").toLowerCase().contains("win")){
+                //获取tomcat的路径
+                String tomcatFilePath=System.getProperty("catalina.home");
+                //删除tomcat目录下的处理后的文件信息
+                File tomcatFile = new File(tomcatFilePath+"/bin/"+"报告审核单.xls");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
+            }else{
+                //删除目录下的处理后的文件信息
+                File tomcatFile = new File("/mnt/project/cloud/"+"报告审核单.xls");
+                if (tomcatFile.isFile()) {
+                    tomcatFile.delete();
+                }
             }
         }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProofreadDetailMapper.xml

@@ -45,7 +45,7 @@
 		select a.*,b.`name` AS type_name,b.sort from cw_proofread_detail a
 		left join cw_proofread_type b on a.type_id = b.id
 		where info_id = #{id}
-		ORDER BY a.create_time DESC
+		ORDER BY b.sort asc
 	</select>
 	<select id="getByTypeIdAndInfoId" resultType="com.jeeplus.finance.projectReport.domain.CwProofreadDetail">
 		select * from cw_proofread_detail where type_id = #{typeId} and info_id = #{infoId}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportReviewService.java

@@ -353,6 +353,9 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
     }
 
     public String add(CwProjectReportData dto) throws Exception{
+
+        long l1 = System.currentTimeMillis();
+
         //生成主键id值
         String id = UUID.randomUUID().toString().replace("-", "");
         //获取当前登录人信息
@@ -360,6 +363,9 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         //保存基本信息
         CwProjectReview info = new CwProjectReview();
         BeanUtils.copyProperties(dto, info);
+
+        long l2 = System.currentTimeMillis();
+        System.out.println("addservice1:" + (l2 -l1));
         //报告编号生成
         String documentNo = "";
         String currentToken = TokenProvider.getCurrentToken();
@@ -374,6 +380,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         } else if (info.getReportType().equals("5")){
             documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE5,currentToken);
         }
+        long l3 = System.currentTimeMillis();
+        System.out.println("addservice2:" + (l3 -l2));
         info.setId(id);
         info.setReportReviewNo(documentNo);
         info.setCreateById(userDTO.getId());
@@ -382,6 +390,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         info.setUpdateTime(new Date());
         info.setReportId(dto.getId());
         mapper.insert(info);
+        long l4 = System.currentTimeMillis();
+        System.out.println("addservice2:" + (l4 -l3));
 //        CwProjectRecords records = new CwProjectRecords();
 //        records.setId(dto.getProjectId());
 //        records.setReportReview("1"); // 已开始报告复核
@@ -399,6 +409,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                 detailMapper.insert(detail);
             }
         }
+        long l5 = System.currentTimeMillis();
+        System.out.println("addservice2:" + (l5 -l4));
         return info.getId();
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -521,6 +521,41 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
 
         IPage<CwProjectReportData> list = reportMapper.findList(page,userDTO,isBmzr, officeIds.toString(), queryWrapper);
+        List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
+        list.getRecords().forEach(li->{
+            if (StringUtils.isBlank(li.getProjectMasterName())){
+                //根据项目经理1的id去查项目经理去名称
+                if (StringUtils.isNotBlank(li.getProjectMasterId())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMasterId().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMasterName(projectMasterName);
+                    }
+                }
+            }
+
+            if (StringUtils.isBlank(li.getRealHeaderName())) {
+                if (StringUtils.isNotBlank(li.getProjectMaster2Id())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMaster2Id().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMaster2Name(projectMasterName);
+                    }
+                }
+            }
+        });
         return list;
 
     }
@@ -1320,7 +1355,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
 
                 Map dataMap = flowTaskService.historicTaskList2(reportData.getProcInsId3());
-                data.putAll(dataMap);
+                if(null != dataMap){
+                    data.putAll(dataMap);
+                }
 //                for (Flow flow : flows) {
 //                    HistoricActivityInstance histIns = flow.getHistIns();
 //                    if(StringUtils.isNotBlank(histIns.getActivityName())){
@@ -2421,14 +2458,17 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateSignatureFiles(List<ProjectReportWorkAttachmentDTO> list, UserDTO userDTO, String id) {
+        System.out.println("进入service1");
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
         for (ProjectReportWorkAttachmentDTO dto : list) {
             names = names + "," +dto.getUrl();
         }
+        System.out.println("进入service2");
         //查询保存的附件信息
         List<WorkAttachmentInfo> infoList = reportMapper.findFileList(id);
+        System.out.println("进入service3");
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
@@ -2442,7 +2482,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 }
             }
         }
+        System.out.println("进入service4");
         reportMapper.deleteAttachement(id,"cwReportSignature");
+        System.out.println("进入service5");
         //保存信息
         for (ProjectReportWorkAttachmentDTO dto : list) {
             WorkAttachmentInfo i = new WorkAttachmentInfo();
@@ -2491,6 +2533,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 attachmentMapper.insert(reportFile);
                 j++;
         }
+        System.out.println("进入service6");
     }
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportAuditSheet/mapper/CwProofreadTypeMapper.xml

@@ -50,6 +50,6 @@
 		WHERE
 			del_flag = 0
 			AND `type` = #{type}
-		ORDER BY sort
+		ORDER BY sort asc
 	</select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -147,6 +147,39 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
                 }
             }
         });
+        List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
+        list.getRecords().forEach(li -> {
+            if (StringUtils.isBlank(li.getProjectMasterName())){
+                //根据项目经理1的id去查项目经理去名称
+                if (StringUtils.isNotBlank(li.getProjectMasterId())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMasterId().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMasterName(projectMasterName);
+                    }
+                }
+            } else if (StringUtils.isBlank(li.getProjectMaster2Name())) {
+                if (StringUtils.isNotBlank(li.getProjectMaster2Id())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMaster2Id().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMaster2Name(projectMasterName);
+                    }
+                }
+            }
+        });
         return list;
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -77,6 +77,7 @@
 				f.name as userName,
 				g.name as projectMasterName,
 				h.name as reportSponsor,
+				h.id as reportSponsorId,
 				d.project_master_id as projectMasterId,
 				d.real_header as projectMaster2Id,
                 k.name as projectMaster2Name,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -156,6 +156,56 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
                 }
             }
         });
+        List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
+        list.getRecords().forEach(li -> {
+            if (StringUtils.isBlank(li.getProjectMasterName())){
+                //根据项目经理1的id去查项目经理去名称
+                if (StringUtils.isNotBlank(li.getProjectMasterId())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMasterId().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMasterName(projectMasterName);
+                    }
+                }
+
+                if (StringUtils.isNotBlank(li.getProjectMaster2Id())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getProjectMaster2Id().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setProjectMaster2Name(projectMasterName);
+                    }
+                }
+
+                if (StringUtils.isBlank(li.getReportSponsor())) {
+                    if (StringUtils.isNotBlank(li.getReportSponsorId())){
+                        UserDTO matchingUser = null;
+                        for (UserDTO user : allUserInfo) {
+                            if (li.getReportSponsorId().equals(user.getId())) {
+                                matchingUser = user;
+                                break;
+                            }
+                        }
+                        if (matchingUser != null) {
+                            String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                            li.setReportSponsor(projectMasterName);
+                        }
+                    }
+                }
+
+            }
+        });
         return list;
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/service/dto/ArchivedReportInfoDto.java

@@ -69,6 +69,11 @@ public class ArchivedReportInfoDto extends BaseDTO {
     private String reportSponsor;
 
     /**
+     * 报告主办人id
+     */
+    private String reportSponsorId;
+
+    /**
      * 报告作废原因
      */
     private String cancellateReason;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/controller/CwWorkClientController.java

@@ -22,6 +22,8 @@ import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
 //import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.service.dto.UserDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -68,6 +70,7 @@ public class CwWorkClientController {
     public ResponseEntity<IPage<CwWorkClientBaseDTO>> data(CwWorkClientBaseDTO cwWorkClientBaseDTO, Page<CwWorkClientBaseDTO> page) throws Exception {
         IPage<CwWorkClientBaseDTO> result = new Page<CwWorkClientBaseDTO>();
         result = cwWorkClientService.findList (page,cwWorkClientBaseDTO);
+        List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
         result.getRecords().stream().forEach(i -> {
             if (StringUtils.isNotBlank(i.getTaskId()) && StringUtils.isNotBlank(i.getStatus())) {
                 if ("2".equals(i.getStatus())) { // “审核中”的数据要获取数据审核人
@@ -75,6 +78,40 @@ public class CwWorkClientController {
                 }
             }
         });
+        result.getRecords().forEach(li -> {
+            if (StringUtils.isBlank(li.getCreateBy().getName())){
+                //根据项目经理1的id去查项目经理去名称
+                UserDTO createBy = li.getCreateBy();
+                if (StringUtils.isNotBlank(li.getCreateBy().getId())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (createBy.getId().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String name = matchingUser.getName(); // Assuming the property name is "userName"
+                        createBy.setName(name);
+                        li.setCreateBy(createBy);
+                    }
+                }
+            } else if (StringUtils.isBlank(li.getUpdateUserName())) {
+                if (StringUtils.isNotBlank(li.getUpdateUser())){
+                    UserDTO matchingUser = null;
+                    for (UserDTO user : allUserInfo) {
+                        if (li.getUpdateUser().equals(user.getId())) {
+                            matchingUser = user;
+                            break;
+                        }
+                    }
+                    if (matchingUser != null) {
+                        String projectMasterName = matchingUser.getName(); // Assuming the property name is "userName"
+                        li.setUpdateUserName(projectMasterName);
+                    }
+                }
+            }
+        });
         return ResponseEntity.ok (result);
     }
 
@@ -104,7 +141,10 @@ public class CwWorkClientController {
     @GetMapping("list_tree")
     public ResponseEntity<IPage<CwWorkClientBaseDTO>> dataTree(CwWorkClientBaseDTO cwWorkClientBaseDTO, Page<CwWorkClientBaseDTO> page) throws Exception {
         IPage<CwWorkClientBaseDTO> result = new Page<CwWorkClientBaseDTO>();
+        long l1 = System.currentTimeMillis();
         result = cwWorkClientService.findListTree (page,cwWorkClientBaseDTO);
+        long l2 = System.currentTimeMillis();
+        System.out.println("查询客户信息列表treeController:" + (l2-l1));
         return ResponseEntity.ok (result);
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwWorkClientBaseMapper.java

@@ -53,6 +53,8 @@ public interface CwWorkClientBaseMapper extends BaseMapper<CwWorkClientBase> {
 
     // 根据客户的id数组查询客户的no(编号)集合
     List<String> getNoByIdArray(@Param("idArray") String[] idArray);
+
+    public IPage<CwWorkClientBaseDTO> getInfoList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -384,4 +384,25 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="getInfoList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"></include>,
+        su.name as user_name,
+        cw_wct.is_listed as is_listed,
+        cw_wct.ownership_type as ownership_type,
+        cw_wct.final_status_type as final_status_type,
+        cw_mlt.name as manage_level_type_name,
+        cw_ot.name as organization_type_name,
+        su1.name as update_user_name,
+        art.ID_ as task_id
+        from cw_work_client_base cw_wcb
+        left join sys_user su on su.id = cw_wcb.create_by_id and su.del_flag = '0'
+        left join cw_work_client_type cw_wct on cw_wct.client_id = cw_wcb.id and cw_wct.del_flag = '0'
+        left join cw_manage_level_type cw_mlt on cw_mlt.id = cw_wcb.manage_level_type and cw_mlt.del_flag = '0'
+        left join cw_organization_type cw_ot on cw_ot.id = cw_wcb.organization_type and cw_ot.del_flag = '0'
+        left join sys_user su1 on su1.id = cw_wcb.update_user and su1.del_flag = '0'
+        left join act_ru_task art on cw_wcb.proc_ins_id = art.PROC_INST_ID_
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/service/CwWorkClientService.java

@@ -147,6 +147,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     }
 
     public IPage<CwWorkClientBaseDTO> findListTree(Page<CwWorkClientBaseDTO> page, CwWorkClientBaseDTO cwWorkClientBaseDTO) throws Exception{
+        long l1 = System.currentTimeMillis();
         QueryWrapper<CwWorkClientBase> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("cw_wcb.del_flag","0");
         queryWrapper.orderByDesc("cw_wcb.create_time");
@@ -213,7 +214,12 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
                 }
             }
         }
-        return cwWorkClientBaseMapper.findList(page, queryWrapper);
+        long l2 = System.currentTimeMillis();
+        System.out.println("查询客户信息列表treeService1:" + (l2-l1));
+        IPage<CwWorkClientBaseDTO> list = cwWorkClientBaseMapper.getInfoList(page, queryWrapper);
+        long l3 = System.currentTimeMillis();
+        System.out.println("查询客户信息列表treeService2:" + (l3-l2));
+        return list;
     }
 
     public CwWorkClientBaseDTO queryById(String id) {

jeeplus-modules/jeeplus-finance/src/main/resources/application-finance.yml

@@ -1,2 +1,2 @@
-#active: development
-active: production
+active: development
+#active: production

jeeplus-modules/jeeplus-finance/src/main/resources/bootstrap.yml

@@ -38,8 +38,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: nacos
-        password: nacos
+#        username: nacos
+#        password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -50,8 +50,8 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
-        username: ${spring.cloud.nacos.discovery.username}
-        password: ${spring.cloud.nacos.discovery.password}
+#        username: ${spring.cloud.nacos.discovery.username}
+#        password: ${spring.cloud.nacos.discovery.password}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-finance/src/main/resources/freemarker/auditRecordFormAfterBinding.ftl

@@ -1,631 +0,0 @@
-<?xml version="1.0"?>
-<?mso-application progid="Excel.Sheet"?>
-<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
-		  xmlns:o="urn:schemas-microsoft-com:office:office"
-		  xmlns:x="urn:schemas-microsoft-com:office:excel"
-		  xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
-		  xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
-		  xmlns:html="http://www.w3.org/TR/REC-html40">
-	<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-		<Author>徐滕</Author>
-		<LastAuthor>徐滕</LastAuthor>
-		<Created>2022-10-20T05:33:45Z</Created>
-		<LastSaved>2022-10-20T05:53:46Z</LastSaved>
-		<Version>16.00</Version>
-	</DocumentProperties>
-	<CustomDocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-		<ICV dt:dt="string">416D7A18A3A947CA8F5937DF8CC0B323</ICV>
-		<KSOProductBuildVer dt:dt="string">2052-11.1.0.12132</KSOProductBuildVer>
-	</CustomDocumentProperties>
-	<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
-		<AllowPNG/>
-	</OfficeDocumentSettings>
-	<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
-		<WindowHeight>17790</WindowHeight>
-		<WindowWidth>19200</WindowWidth>
-		<WindowTopX>32767</WindowTopX>
-		<WindowTopY>32767</WindowTopY>
-		<ProtectStructure>False</ProtectStructure>
-		<ProtectWindows>False</ProtectWindows>
-	</ExcelWorkbook>
-	<Styles>
-		<Style ss:ID="Default" ss:Name="Normal">
-			<Alignment ss:Vertical="Center"/>
-											<Borders/>
-													 <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																															<Interior/>
-																																	  <NumberFormat/>
-																																					<Protection/>
-		</Style>
-		<Style ss:ID="m1443364801392">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   </Borders>
-																																																																								 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																																																																						   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364799376">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																																																																						<Interior/>
-		</Style>
-		<Style ss:ID="m1443364799396">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364799416">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						  </Borders>
-																																																							<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																								 <Interior/>
-		</Style>
-		<Style ss:ID="m1443364799436">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   </Borders>
-																																																																								 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																																																																						   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364799456">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						  </Borders>
-																																																							<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																								 <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792656">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																													<Interior/>
-		</Style>
-		<Style ss:ID="m1443364792696">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792716">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792736">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792320">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792340">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792360">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792380">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364792400">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364791312">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364791332">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364791352">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364791372">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																													<Interior/>
-		</Style>
-		<Style ss:ID="m1443364790976">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364790996">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364791016">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																													<Interior/>
-		</Style>
-		<Style ss:ID="m1443364791056">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							</Borders>
-																																																																							  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																								   <Interior/>
-		</Style>
-		<Style ss:ID="m1443364786332">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																													<Interior/>
-		</Style>
-		<Style ss:ID="s66">
-			<Alignment ss:Vertical="Center"/>
-											<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																												 <Interior/>
-		</Style>
-		<Style ss:ID="s67">
-			<Alignment ss:Vertical="Center"/>
-											<Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																									  <Interior/>
-		</Style>
-		<Style ss:ID="s68">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																														   <Interior/>
-																																	 <NumberFormat ss:Format="yyyy&quot;年&quot;m&quot;月&quot;d&quot;日&quot;;@"/>
-		</Style>
-		<Style ss:ID="s69">
-			<Alignment ss:Horizontal="Justify" ss:Vertical="Center"/>
-																	<Borders/>
-																			 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																				  <Interior/>
-		</Style>
-		<Style ss:ID="s70">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Borders/>
-																		  <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																	<Interior/>
-																																			  <NumberFormat ss:Format="yyyy&quot;年&quot;m&quot;月&quot;d&quot;日&quot;;@"/>
-		</Style>
-		<Style ss:ID="s71">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																	  <Interior/>
-		</Style>
-		<Style ss:ID="s72">
-			<Alignment ss:Horizontal="Justify" ss:Vertical="Center"/>
-																	<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																		 <Interior/>
-		</Style>
-		<Style ss:ID="s73">
-			<Alignment ss:Vertical="Center"/>
-											<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																												 <Interior/>
-		</Style>
-		<Style ss:ID="s81">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																						 <Interior/>
-		</Style>
-		<Style ss:ID="s82">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																						 <Interior/>
-		</Style>
-		<Style ss:ID="s83">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																						<Interior/>
-		</Style>
-		<Style ss:ID="s86">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																																																																																																						  <Interior/>
-		</Style>
-		<Style ss:ID="s87">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																																																																																																						  <Interior/>
-		</Style>
-		<Style ss:ID="s89">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																										<Interior/>
-		</Style>
-		<Style ss:ID="s91">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																					  </Borders>
-																																						<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																							 <Interior/>
-		</Style>
-		<Style ss:ID="s92">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																						<Interior/>
-		</Style>
-		<Style ss:ID="s93">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders/>
-																							<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																								 <Interior/>
-		</Style>
-		<Style ss:ID="s94">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																					   </Borders>
-																																						 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																							  <Interior/>
-		</Style>
-		<Style ss:ID="s103">
-			<Alignment ss:Horizontal="Right" ss:Vertical="Center"/>
-																  <Borders/>
-																		   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																	 <Interior/>
-		</Style>
-		<Style ss:ID="s104">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Font ss:FontName="黑体" x:CharSet="134" x:Family="Modern" ss:Size="16"
-			ss:Color="#000000" ss:Bold="1"/>
-										   <Interior/>
-		</Style>
-		<Style ss:ID="s111">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																													<Interior/>
-		</Style>
-	</Styles>
-	<Worksheet ss:Name="Sheet1">
-		<Table ss:ExpandedColumnCount="5" ss:ExpandedRowCount="35" x:FullColumns="1"
-			   x:FullRows="1" ss:DefaultColumnWidth="54" ss:DefaultRowHeight="13.5">
-			<Column ss:AutoFitWidth="0" ss:Width="39"/>
-			<Column ss:AutoFitWidth="0" ss:Width="28.5"/>
-			<Column ss:AutoFitWidth="0" ss:Width="314.25"/>
-			<Column ss:AutoFitWidth="0" ss:Width="100.5" ss:Span="1"/>
-			<Row ss:AutoFitHeight="0" ss:Height="15">
-				<Cell ss:MergeAcross="4" ss:StyleID="s103"><Data ss:Type="String">索引号：G-1-6-7</Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="30">
-				<Cell ss:MergeAcross="4" ss:StyleID="s104"><Data ss:Type="String">评估报告装订后浏览审核记录表</Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:StyleID="s66"><ss:Data ss:Type="String"
-												xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																							  html:Color="#000000">项目名称：</Font></ss:Data></Cell>
-				<Cell ss:StyleID="s66"/>
-				<Cell ss:MergeAcross="2" ss:StyleID="s67"><Data ss:Type="String">${projectName}</Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:StyleID="s66"><ss:Data ss:Type="String"
-												xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																							  html:Color="#000000">评估基准日：</Font></ss:Data></Cell>
-				<Cell ss:StyleID="s66"/>
-				<Cell ss:StyleID="s68"><Data ss:Type="String">${assessBaseMessage}</Data></Cell>
-				<Cell ss:StyleID="s66"><ss:Data ss:Type="String"
-												xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																							  html:Color="#000000">项目负责人：</Font></ss:Data></Cell>
-				<Cell ss:StyleID="s67"><Data ss:Type="String">${projectMaster}</Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:StyleID="s66"><ss:Data ss:Type="String"
-												xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																							  html:Color="#000000">项目审核人：</Font></ss:Data></Cell>
-				<Cell ss:StyleID="s66"/>
-				<Cell ss:StyleID="s67"><Data ss:Type="String">${projectauditor}</Data></Cell>
-				<Cell ss:StyleID="s69"><ss:Data ss:Type="String"
-												xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																							  html:Color="#000000">审核日期：</Font></ss:Data></Cell>
-				<Cell ss:StyleID="s70"><Data ss:Type="String">${projectAuditDate}</Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:StyleID="s71"/>
-				<Cell ss:StyleID="s71"/>
-				<Cell ss:StyleID="s71"/>
-				<Cell ss:StyleID="s72"/>
-				<Cell ss:StyleID="s73"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="27">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364786332"><ss:Data ss:Type="String"
-																			  xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																															   x:CharSet="134" html:Color="#000000">一、报告、说明、明细表一致性</Font></B></ss:Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="2" ss:StyleID="s111"><ss:Data ss:Type="String"
-																	xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																													 x:CharSet="134" html:Color="#000000">审核要点</Font></B></ss:Data></Cell>
-				<Cell ss:StyleID="s81"><Data ss:Type="String">审核情况（√/×）</Data></Cell>
-				<Cell ss:StyleID="s82"><Data ss:Type="String">改正情况（√/×）</Data></Cell>
-			</Row>
-
-			<#list assessmentList as assessment>
-				<Row ss:AutoFitHeight="0" ss:Height="18">
-					<Cell ss:StyleID="s83"><Data ss:Type="Number">${assessment.serialNumber}</Data></Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="m1443364790976"><ss:Data ss:Type="String"
-																				  xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																																html:Color="#000000">${assessment.typeName}</Font></ss:Data></Cell>
-					<Cell ss:StyleID="s86"><Data ss:Type="String">${assessment.reviewComments}</Data></Cell>
-					<Cell ss:StyleID="s87"><Data ss:Type="String">${assessment.replyComments}</Data></Cell>
-				</Row>
-			</#list>
-
-
-			<Row ss:AutoFitHeight="0" ss:Height="27">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364791016"><ss:Data ss:Type="String"
-																			  xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																															   x:CharSet="134" html:Color="#000000">二、评估报告</Font></B></ss:Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="2" ss:StyleID="s111"><ss:Data ss:Type="String"
-																	xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																													 x:CharSet="134" html:Color="#000000">审核要点</Font></B></ss:Data></Cell>
-				<Cell ss:StyleID="s81"><Data ss:Type="String">审核情况（√/×）</Data></Cell>
-				<Cell ss:StyleID="s82"><Data ss:Type="String">改正情况（√/×）</Data></Cell>
-			</Row>
-
-			<#list assessmentReportList as assessmentReport>
-				<Row ss:AutoFitHeight="0" ss:Height="18">
-					<Cell ss:StyleID="s83"><Data ss:Type="Number">${assessmentReport.serialNumber}</Data></Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="m1443364791056"><ss:Data ss:Type="String"
-																				  xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																																html:Color="#000000">${assessmentReport.typeName}</Font></ss:Data></Cell>
-					<Cell ss:StyleID="s86"><Data ss:Type="String">${assessmentReport.reviewComments}</Data></Cell>
-					<Cell ss:StyleID="s87"><Data ss:Type="String">${assessmentReport.replyComments}</Data></Cell>
-				</Row>
-			</#list>
-
-
-			<Row ss:AutoFitHeight="0" ss:Height="27">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364791372"><ss:Data ss:Type="String"
-																			  xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																															   x:CharSet="134" html:Color="#000000">三、评估说明</Font></B></ss:Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="2" ss:StyleID="s111"><ss:Data ss:Type="String"
-																	xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																													 x:CharSet="134" html:Color="#000000">审核要点</Font></B></ss:Data></Cell>
-				<Cell ss:StyleID="s81"><Data ss:Type="String">审核情况（√/×）</Data></Cell>
-				<Cell ss:StyleID="s82"><Data ss:Type="String">改正情况（√/×）</Data></Cell>
-			</Row>
-
-			<#list assessmentExplainList as assessmentExplain>
-				<Row ss:AutoFitHeight="0" ss:Height="18">
-					<Cell ss:StyleID="s83"><Data ss:Type="Number">${assessmentExplain.serialNumber}</Data></Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="m1443364792320"><ss:Data ss:Type="String"
-																				  xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																																html:Color="#000000">${assessmentExplain.typeName}</Font></ss:Data></Cell>
-					<Cell ss:StyleID="s86"><Data ss:Type="String">${assessmentExplain.reviewComments}</Data></Cell>
-					<Cell ss:StyleID="s87"><Data ss:Type="String">${assessmentExplain.replyComments}</Data></Cell>
-				</Row>
-			</#list>
-
-
-			<Row ss:AutoFitHeight="0" ss:Height="27">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364792656"><ss:Data ss:Type="String"
-																			  xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																															   x:CharSet="134" html:Color="#000000">四、评估明细表</Font></B></ss:Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="2" ss:StyleID="s111"><ss:Data ss:Type="String"
-																	xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Face="宋体"
-																													 x:CharSet="134" html:Color="#000000">审核要点</Font></B></ss:Data></Cell>
-				<Cell ss:StyleID="s81"><Data ss:Type="String">审核情况（√/×）</Data></Cell>
-				<Cell ss:StyleID="s82"><Data ss:Type="String">改正情况（√/×）</Data></Cell>
-			</Row>
-
-			<#list assessmentDetailList as assessmentDetail>
-				<Row ss:AutoFitHeight="0" ss:Height="18">
-					<Cell ss:StyleID="s83"><Data ss:Type="Number">${assessmentDetail.serialNumber}</Data></Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="m1443364792320"><ss:Data ss:Type="String"
-																				  xmlns="http://www.w3.org/TR/REC-html40"><Font html:Face="宋体" x:CharSet="134"
-																																html:Color="#000000">${assessmentDetail.typeName}</Font></ss:Data></Cell>
-					<Cell ss:StyleID="s86"><Data ss:Type="String">${assessmentDetail.reviewComments}</Data></Cell>
-					<Cell ss:StyleID="s87"><Data ss:Type="String">${assessmentDetail.replyComments}</Data></Cell>
-				</Row>
-			</#list>
-
-
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:StyleID="s91"/>
-				<Cell ss:StyleID="s92"/>
-				<Cell ss:StyleID="s93"/>
-				<Cell ss:StyleID="s93"/>
-				<Cell ss:StyleID="s94"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364799416"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364799436"><ss:Data ss:Type="String"
-																			  xmlns="http://www.w3.org/TR/REC-html40"><Font html:Color="#000000">审核人员签字：${auditPersonnel}</Font><Font
-								html:Face="Arial Narrow" x:Family="Swiss" html:Color="#000000">                                                                                             </Font>
-						<Font html:Color="#000000">${correctDate}</Font></ss:Data></Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364799456"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18">
-				<Cell ss:MergeAcross="4" ss:StyleID="m1443364801392"><ss:Data ss:Type="String"
-																			  xmlns="http://www.w3.org/TR/REC-html40"><Font html:Color="#000000">改正人员签字：${correctPersonnel}</Font><Font
-								html:Face="Arial Narrow" x:Family="Swiss" html:Color="#000000">                                                                                            </Font>
-						<Font html:Color="#000000">${correctDate}</Font></ss:Data></Cell>
-			</Row>
-		</Table>
-		<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-			<Selected/>
-			<Panes>
-				<Pane>
-					<Number>3</Number>
-					<ActiveRow>16</ActiveRow>
-					<ActiveCol>6</ActiveCol>
-				</Pane>
-			</Panes>
-			<ProtectObjects>False</ProtectObjects>
-			<ProtectScenarios>False</ProtectScenarios>
-		</WorksheetOptions>
-	</Worksheet>
-</Workbook>

jeeplus-modules/jeeplus-finance/src/main/resources/freemarker/proofreadAudit.ftl

@@ -1,807 +0,0 @@
-<?xml version="1.0"?>
-<?mso-application progid="Excel.Sheet"?>
-<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40">
-	<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-		<Author>徐滕</Author>
-		<LastAuthor>徐滕</LastAuthor>
-		<Created>2022-10-20T07:26:00Z</Created>
-		<LastSaved>2023-01-12T01:54:05Z</LastSaved>
-		<Version>16.00</Version>
-	</DocumentProperties>
-	<CustomDocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-		<ICV dt:dt="string">33A31C1D1F684C67A27B9367A7E4323E</ICV>
-		<KSOProductBuildVer dt:dt="string">2052-11.1.0.12132</KSOProductBuildVer>
-	</CustomDocumentProperties>
-	<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
-		<AllowPNG/>
-	</OfficeDocumentSettings>
-	<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
-		<WindowHeight>17940</WindowHeight>
-		<WindowWidth>32760</WindowWidth>
-		<WindowTopX>32760</WindowTopX>
-		<WindowTopY>32760</WindowTopY>
-		<ProtectStructure>False</ProtectStructure>
-		<ProtectWindows>False</ProtectWindows>
-		<DisplayInkNotes>False</DisplayInkNotes>
-	</ExcelWorkbook>
-	<Styles>
-		<Style ss:ID="Default" ss:Name="Normal">
-			<Alignment ss:Vertical="Center"/>
-											<Borders/>
-													 <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																															<Interior/>
-																																	  <NumberFormat/>
-																																					<Protection/>
-		</Style>
-		<Style ss:ID="s64">
-			<Alignment ss:Vertical="Center"/>
-											<Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																												   <Interior/>
-		</Style>
-		<Style ss:ID="s65">
-			<Alignment ss:Vertical="Center"/>
-											<Borders/>
-													 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																														  <Interior/>
-		</Style>
-		<Style ss:ID="s66">
-			<Alignment ss:Vertical="Center"/>
-											<Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																												 <Interior/>
-		</Style>
-		<Style ss:ID="s67">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Borders/>
-																		  <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																			   <Interior/>
-		</Style>
-		<Style ss:ID="s68">
-			<Alignment ss:Vertical="Center"/>
-											<Borders/>
-													 <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																															<Interior/>
-		</Style>
-		<Style ss:ID="s69">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders/>
-																			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																																				   <Interior/>
-		</Style>
-		<Style ss:ID="s72">
-			<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-															<Borders/>
-																	 <Font ss:FontName="黑体" x:CharSet="134" x:Family="Modern" ss:Size="12" ss:Color="#000000"/>
-																																							  <Interior/>
-		</Style>
-		<Style ss:ID="s76">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Borders/>
-																		  <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																	<Interior/>
-																																			  <NumberFormat ss:Format="Long Date"/>
-		</Style>
-		<Style ss:ID="s78">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																	  <Interior/>
-		</Style>
-		<Style ss:ID="s79">
-			<Alignment ss:Vertical="Center"/>
-											<Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																									  <Interior/>
-		</Style>
-		<Style ss:ID="s81">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																		<Interior/>
-		</Style>
-		<Style ss:ID="s85">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																									<Interior/>
-		</Style>
-		<Style ss:ID="s86">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			 </Borders>
-																																																																			   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																					 <Interior/>
-		</Style>
-		<Style ss:ID="s87">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																									<Interior/>
-		</Style>
-		<Style ss:ID="s88">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																						<Interior/>
-		</Style>
-		<Style ss:ID="s90">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																																																																																			 <Interior/>
-		</Style>
-		<Style ss:ID="s91">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			 </Borders>
-																																																																			   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																																																																		 <Interior/>
-		</Style>
-		<Style ss:ID="s92">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																																																																																			 <Interior/>
-		</Style>
-		<Style ss:ID="s95">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																						 <Interior/>
-		</Style>
-		<Style ss:ID="s97">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-																   <Borders>
-																   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																		<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																		   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																			   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																				 </Borders>
-																																																																																				   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																						 <Interior/>
-		</Style>
-		<Style ss:ID="s98">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																										<Interior/>
-		</Style>
-		<Style ss:ID="s100">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																										 <Interior/>
-		</Style>
-		<Style ss:ID="s101">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							 </Borders>
-																																																																							   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																									 <Interior/>
-		</Style>
-		<Style ss:ID="s102">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																										 <Interior/>
-		</Style>
-		<Style ss:ID="s107">
-			<Alignment ss:Horizontal="Right" ss:Vertical="Center"/>
-																  <Borders/>
-																		   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																	 <Interior/>
-		</Style>
-		<Style ss:ID="s108">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders/>
-																							<Font ss:FontName="黑体" x:CharSet="134" x:Family="Modern" ss:Size="16" ss:Color="#000000" ss:Bold="1"/>
-																																																 <Interior/>
-		</Style>
-		<Style ss:ID="s109">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																					  <Interior/>
-		</Style>
-		<Style ss:ID="s110">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																																		   <Interior/>
-		</Style>
-		<Style ss:ID="s111">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																	  <Interior/>
-																																				<NumberFormat ss:Format="Long Date"/>
-		</Style>
-		<Style ss:ID="s112">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																														   <Interior/>
-		</Style>
-		<Style ss:ID="s114">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000"/>
-																														   <Interior/>
-																																	 <NumberFormat ss:Format="yyyy&quot;年&quot;m&quot;月&quot;d&quot;日&quot;;@"/>
-		</Style>
-		<Style ss:ID="s115">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																																							   </Borders>
-																																																																																								 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																									   <Interior/>
-		</Style>
-		<Style ss:ID="s116">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																							   </Borders>
-																																																																																								 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																												  <Interior/>
-		</Style>
-		<Style ss:ID="s117">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																													<Interior/>
-		</Style>
-		<Style ss:ID="s118">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																						 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																							   </Borders>
-																																																																																								 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																									  <Interior/>
-		</Style>
-		<Style ss:ID="s119">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																							   </Borders>
-																																																																																								 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																									   <Interior/>
-		</Style>
-		<Style ss:ID="s120">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																										 <Interior/>
-		</Style>
-		<Style ss:ID="s121">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																							 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																							   </Borders>
-																																																																																								 <Font ss:FontName="宋体" x:CharSet="134" ss:Color="#000000" ss:Bold="1"/>
-																																																																																																									   <Interior/>
-		</Style>
-		<Style ss:ID="s122">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
-																 <Borders>
-																 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																	  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																		 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																			 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																			   </Borders>
-																																																																																				 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																					  <Interior/>
-		</Style>
-		<Style ss:ID="s123">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-																				   <Borders>
-																				   <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																						<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						   <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																								 </Borders>
-																																																																																								   <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																										<Interior/>
-		</Style>
-		<Style ss:ID="s124">
-			<Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
-																				 <Borders>
-																				 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																					  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																						 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-																																																																							 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-																																																																																							   </Borders>
-																																																																																								 <Font ss:FontName="Arial Narrow" x:Family="Swiss" ss:Color="#000000"/>
-																																																																																																									  <Interior/>
-		</Style>
-		<Style ss:ID="s125">
-			<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-															<Borders/>
-																	 <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-																																			<Interior/>
-																																					  <NumberFormat/>
-																																									<Protection/>
-		</Style>
-	</Styles>
-	<Worksheet ss:Name="Sheet1">
-		<Table ss:ExpandedColumnCount="7" ss:ExpandedRowCount="80" x:FullColumns="1" x:FullRows="1" ss:StyleID="s68" ss:DefaultColumnWidth="51.75" ss:DefaultRowHeight="13.5">
-			<Column ss:StyleID="s68" ss:AutoFitWidth="0" ss:Width="32.25"/>
-			<Column ss:StyleID="s68" ss:AutoFitWidth="0" ss:Width="34.5"/>
-			<Column ss:StyleID="s68" ss:AutoFitWidth="0" ss:Width="369.75"/>
-			<Column ss:StyleID="s69" ss:AutoFitWidth="0" ss:Width="71.25" ss:Span="1"/>
-			<Column ss:Index="6" ss:StyleID="s69" ss:AutoFitWidth="0" ss:Width="76.5"/>
-			<Column ss:StyleID="s68" ss:AutoFitWidth="0" ss:Width="90.75"/>
-			<Row ss:AutoFitHeight="0" ss:Height="15" ss:StyleID="s64">
-				<Cell ss:MergeAcross="5" ss:StyleID="s107">
-					<Data ss:Type="String">索引号：G-1-6-5</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="30">
-				<Cell ss:MergeAcross="5" ss:StyleID="s108">
-					<Data ss:Type="String">资产评估项目（校对）审核记录表</Data>
-				</Cell>
-				<Cell ss:StyleID="s72"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="1" ss:StyleID="s109">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">项目名称：</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:MergeAcross="3" ss:StyleID="s110">
-					<Data ss:Type="String">${projectName}</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="1" ss:StyleID="s111">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">评估基准日：</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s76">
-					<Data ss:Type="String">${assessBaseMessage}</Data>
-				</Cell>
-				<Cell ss:StyleID="s67">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">项目负责人：</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:MergeAcross="1" ss:StyleID="s112">
-					<Data ss:Type="String">${projectMaster}</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="1" ss:StyleID="s78">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">项目审核人</Font>
-						<Font html:Color="#000000"> </Font>
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">：</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s79">
-					<Data ss:Type="String">${projectauditor}</Data>
-				</Cell>
-				<Cell ss:StyleID="s67">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">审核日期：</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:MergeAcross="1" ss:StyleID="s114">
-					<Data ss:Type="String">${projectAuditDate}</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="9.9375" ss:StyleID="s66">
-				<Cell ss:StyleID="s78"/>
-				<Cell ss:StyleID="s78"/>
-				<Cell ss:StyleID="s78"/>
-				<Cell ss:StyleID="s81"/>
-				<Cell ss:StyleID="s81"/>
-				<Cell ss:StyleID="s81"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="26.0625" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s115">
-					<Data ss:Type="String">一、明细表</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s116">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<B>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">资产基础法</Font>
-							<Font html:Color="#000000">/</Font>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">成本法评估明细表</Font>
-						</B>
-					</ss:Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="2" ss:StyleID="s117">
-					<Data ss:Type="String">审核要点</Data>
-				</Cell>
-				<Cell ss:StyleID="s85">
-					<Data ss:Type="String">审核意见</Data>
-				</Cell>
-				<Cell ss:StyleID="s86">
-					<Data ss:Type="String">是否适用</Data>
-				</Cell>
-				<Cell ss:StyleID="s87">
-					<Data ss:Type="String">回复意见</Data>
-				</Cell>
-			</Row>
-			<#list detailedStatementList as detailedStatement>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s67">
-					<Cell ss:StyleID="s88">
-						<Data ss:Type="Number">${detailedStatement.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-
-						<Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${detailedStatement.typeName}</Font>
-						</Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${detailedStatement.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${detailedStatement.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${detailedStatement.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="26.0625" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s119">
-					<Data ss:Type="String">二、评估说明</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="2" ss:StyleID="s120">
-					<Data ss:Type="String">审核要点</Data>
-				</Cell>
-				<Cell ss:StyleID="s95">
-					<Data ss:Type="String">审核意见</Data>
-				</Cell>
-				<Cell ss:StyleID="s86">
-					<Data ss:Type="String">是否适用</Data>
-				</Cell>
-				<Cell ss:StyleID="s97">
-					<Data ss:Type="String">回复意见</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s116">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<B>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">（一）封面至评估范围　</Font>
-						</B>
-					</ss:Data>
-				</Cell>
-			</Row>
-
-			<#list assessmentInstructions1List as assessmentInstructions1>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-					<Cell ss:StyleID="s98">
-						<Data ss:Type="Number">${assessmentInstructions1.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-						<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${assessmentInstructions1.typeName}</Font>
-						</ss:Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${assessmentInstructions1.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${assessmentInstructions1.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${assessmentInstructions1.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s116">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<B>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">（二）资产核实情况总体说明</Font>
-						</B>
-					</ss:Data>
-				</Cell>
-			</Row>
-
-			<#list assessmentInstructions2List as assessmentInstructions2>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-					<Cell ss:StyleID="s98">
-						<Data ss:Type="Number">${assessmentInstructions2.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-						<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${assessmentInstructions2.typeName}</Font>
-						</ss:Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${assessmentInstructions2.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${assessmentInstructions2.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${assessmentInstructions2.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s116">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<B>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">（三）资产基础法</Font>
-							<Font html:Color="#000000">/</Font>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">成本法评估技术说明</Font>
-						</B>
-					</ss:Data>
-				</Cell>
-			</Row>
-
-			<#list assessmentInstructions3List as assessmentInstructions3>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-					<Cell ss:StyleID="s98">
-						<Data ss:Type="Number">${assessmentInstructions3.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-						<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${assessmentInstructions3.typeName}</Font>
-						</ss:Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${assessmentInstructions3.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${assessmentInstructions3.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${assessmentInstructions3.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s116">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<B>
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">（四）评估结论及分析　</Font>
-						</B>
-					</ss:Data>
-				</Cell>
-			</Row>
-
-			<#list assessmentInstructions4List as assessmentInstructions4>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-					<Cell ss:StyleID="s98">
-						<Data ss:Type="Number">${assessmentInstructions4.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-						<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${assessmentInstructions4.typeName}</Font>
-						</ss:Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${assessmentInstructions4.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${assessmentInstructions4.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${assessmentInstructions4.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s119">
-					<Data ss:Type="String">（五）关于评估有关事项的说明</Data>
-				</Cell>
-			</Row>
-
-			<#list assessmentInstructions5List as assessmentInstructions5>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-					<Cell ss:StyleID="s98">
-						<Data ss:Type="Number">${assessmentInstructions5.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-						<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${assessmentInstructions5.typeName}</Font>
-						</ss:Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${assessmentInstructions5.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${assessmentInstructions5.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${assessmentInstructions5.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="2" ss:StyleID="s121">
-					<Data ss:Type="String">（六）其他问题</Data>
-				</Cell>
-				<Cell ss:StyleID="s100"/>
-				<Cell ss:StyleID="s101"/>
-				<Cell ss:StyleID="s102"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="26.0625" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s119">
-					<Data ss:Type="String">三、评估报告</Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="2" ss:StyleID="s117">
-					<Data ss:Type="String">审核要点</Data>
-				</Cell>
-				<Cell ss:StyleID="s85">
-					<Data ss:Type="String">审核意见</Data>
-				</Cell>
-				<Cell ss:StyleID="s86">
-					<Data ss:Type="String">是否适用</Data>
-				</Cell>
-				<Cell ss:StyleID="s87">
-					<Data ss:Type="String">回复意见</Data>
-				</Cell>
-
-			</Row>
-
-			<#list assessmentReportList as assessmentReport>
-				<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-					<Cell ss:StyleID="s98">
-						<Data ss:Type="Number">${assessmentReport.serialNumber}</Data>
-					</Cell>
-					<Cell ss:MergeAcross="1" ss:StyleID="s118">
-						<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-							<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">${assessmentReport.typeName}</Font>
-						</ss:Data>
-					</Cell>
-					<Cell ss:StyleID="s90">
-						<Data ss:Type="String">${assessmentReport.reviewComments}</Data>
-					</Cell>
-					<Cell ss:StyleID="s91">
-						<Data ss:Type="String">${assessmentReport.isApply}</Data>
-					</Cell>
-					<Cell ss:StyleID="s92">
-						<Data ss:Type="String">${assessmentReport.replyComments}</Data>
-					</Cell>
-				</Row>
-			</#list>
-
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s122">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">经确认，执行人员已按审核意见全部修改处理。</Font>
-					</ss:Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:MergeDown="3" ss:StyleID="s125">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#000000">对下列意见保留：</Font>
-						<Font>       </Font>
-						<Font html:Color="#000000">&#10;${qualifiedOpinion}</Font>
-						<Font>       </Font>
-						<Font html:Color="#000000">&#10;                                     执行人员签字：${executor}              ${executorDate}</Font>
-					</ss:Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65" ss:Span="2"/>
-			<Row ss:Index="75" ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s123"/>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:StyleID="s124">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Face="宋体" x:CharSet="134" html:Color="#000000">经确认，执行人员已按审核意见检查并处理。</Font>
-					</ss:Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65">
-				<Cell ss:MergeAcross="5" ss:MergeDown="3" ss:StyleID="s125">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#000000">对下列意见未修改：</Font>
-						<Font html:Face="Arial Narrow" x:Family="Swiss" html:Color="#000000">&#10;${notModifiedOpinion}</Font>
-						<Font html:Color="#000000">&#10;                                     审核人员签字：${executor}               ${executorDate}</Font>
-					</ss:Data>
-				</Cell>
-			</Row>
-			<Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s65" ss:Span="2"/>
-		</Table>
-		<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-			<Unsynced/>
-			<PageBreakZoom>60</PageBreakZoom>
-			<Selected/>
-			<Panes>
-				<Pane>
-					<Number>3</Number>
-					<ActiveRow>17</ActiveRow>
-					<ActiveCol>8</ActiveCol>
-				</Pane>
-			</Panes>
-			<ProtectObjects>False</ProtectObjects>
-			<ProtectScenarios>False</ProtectScenarios>
-		</WorksheetOptions>
-	</Worksheet>
-</Workbook>

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -534,7 +534,7 @@ public class FlowableTaskController {
      *
      * @param procInsId 流程实例
      */
-    @GetMapping("historicTaskList2")
+    @PostMapping("historicTaskList2")
     public Map historicTaskList2(String procInsId) throws Exception {
         return flowTaskService.historicTaskList2(procInsId);
     }
@@ -544,7 +544,7 @@ public class FlowableTaskController {
      *
      * @param procInsId 流程实例
      */
-    @GetMapping("historicTaskList3")
+    @PostMapping("historicTaskList3")
     public Map historicTaskList3(String procInsId) throws Exception {
         return flowTaskService.historicTaskList3(procInsId);
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/OfficeController.java

@@ -164,6 +164,28 @@ public class OfficeController {
         List <OfficeDTO> list = officeService.findAccessList ( tenantId, parentId );
         //List <OfficeDTO> rootTree = officeService.getRootTree (list, extId, type, showAll,"1" );
         List <OfficeDTO> rootTree = officeService.getOldRootTree (parentId,list, extId, type, showAll );
+        return ResponseEntity.ok ( rootTree );
+    }
+
+    /**
+     * 根据用户查询出部门组织。
+     *
+     * @param extId   排除的ID
+     * @param type    类型（1：公司；2：部门）
+     * @param showAll 是否显示不可用数据 1 显示 0 隐藏
+     * @return
+     */
+    @ApiLog("根据用户查询出部门组织")
+    @GetMapping("treeDataByUser")
+    public ResponseEntity <List <OfficeDTO>> treeDataByUser(@RequestParam(required = false) String tenantId,
+                                                            @RequestParam(required = false) String parentId,
+                                                            @RequestParam(required = false) String extId,
+                                                            @RequestParam(required = false) String type,
+                                                            @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
+        //根据签字注师2岗位用户所在部门查部门数据
+        List <OfficeDTO> list = officeService.findListByUser ( tenantId, parentId );
+        //List <OfficeDTO> rootTree = officeService.getRootTree (list, extId, type, showAll,"1" );
+        List <OfficeDTO> rootTree = officeService.getOldRootTree (parentId,list, extId, type, showAll );
 
         return ResponseEntity.ok ( rootTree );
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -98,6 +98,11 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public List<UserDTO> getAllUserInfo() {
+        return userService.getAllUserInfo();
+    }
+
+    @Override
     public List<UserDTO> findListFlowAbleByPostId(String postId) {
         return userService.findListFlowAbleByPostId ( postId );
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -224,4 +224,21 @@ public interface UserMapper extends BaseMapper <User> {
      * @return
      */
     String isUpdatePassword(String userId);
+
+    /**
+     * 获取所有的用户信息
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    List<UserDTO> getAllUserInfo();
+
+    /**
+     * 获取拥有权限的用户的部门id
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    List<String> getHasUser();
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<String> getHasUserFather();
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -510,5 +510,32 @@ select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.l
         </if>
         AND post.del_flag = 0
     </select>
+    <select id="getAllUserInfo" resultType="com.jeeplus.sys.service.dto.UserDTO">
+        select distinct id,name from sys_user where del_flag = '0'
+    </select>
+    <select id="getHasUser" resultType="java.lang.String">
+        SELECT DISTINCT
+    	a.office_id AS "id"
+         FROM sys_user a
+         LEFT JOIN sys_cert sc
+         ON a.id = sc.user_id and sc.del_flag = '0'
+         LEFT JOIN sys_office c
+         ON c.id = a.company_id
+         LEFT JOIN sys_office o
+         ON o.id = a.office_id
+         WHERE (sc.type = '6' AND a.del_flag = 0)
+    </select>
+    <select id="getHasUserFather" resultType="java.lang.String">
+        SELECT DISTINCT
+                o.parent_id AS "id"
+         FROM sys_user a
+         LEFT JOIN sys_cert sc
+         ON a.id = sc.user_id and sc.del_flag = '0'
+         LEFT JOIN sys_office c
+         ON c.id = a.company_id
+         LEFT JOIN sys_office o
+         ON o.id = a.office_id
+         WHERE (sc.type = '6' AND a.del_flag = 0)
+    </select>
 
 </mapper>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -118,6 +118,25 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
         return baseMapper.findAccessList ( queryWrapper );
     }
 
+    /**
+     * 用户信息获取列表
+     *
+     * @return
+     */
+    public List <OfficeDTO> findListByUser(String tenantId, String parentId) {
+        // 查询出拥有证书的用户信息所属的部门id
+        List<String> ids = userService.hasUser();
+
+
+        QueryWrapper queryWrapper = new QueryWrapper ( );
+        queryWrapper.like ( StringUtils.isNotBlank ( parentId ), "a.parent_ids", "," + parentId + "," );
+        queryWrapper.eq ( StringUtils.isNotBlank ( tenantId ), "a.tenant_id", tenantId );
+        queryWrapper.eq ( "a.del_flag", 0 );
+        queryWrapper.orderByAsc ( "a.sort" );
+        queryWrapper.in ( "a.id", ids );
+        return baseMapper.findAccessList ( queryWrapper );
+    }
+
     public List <OfficeDTO> getAccessRootTree(List<OfficeDTO> list, String extId, String type, String showAll, String showMyOffice) {
         List<OfficeDTO> offices = Lists.newArrayList ();
         // 获取到所有parent_id为‘0’的部门数据

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -506,4 +506,19 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         });
         return  list;
     }
+
+    public List<UserDTO> getAllUserInfo() {
+        return userMapper.getAllUserInfo();
+    }
+
+    /**
+     * 查询出拥有权限的用户的部门id
+     * @return
+     */
+    public List<String> hasUser() {
+        List<String> hasUser = userMapper.getHasUser();
+        List<String> hasUserFather = userMapper.getHasUserFather();
+        hasUser.addAll(hasUserFather);
+        return hasUser;
+    }
 }

jeeplus-modules/jeeplus-wps/target/classes/bootstrap.yml

@@ -36,6 +36,8 @@ spring:
         server-addr: 127.0.0.1:8848
         # 命名空间
         namespace: ${spring.profiles.active}
+        username: nacos
+        password: nacos
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
@@ -46,6 +48,8 @@ spring:
           - application.${spring.cloud.nacos.config.file-extension}
         # 命名空间
         namespace: ${spring.profiles.active}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
     sentinel:
       transport:
         dashboard: 127.0.0.1:8858

jeeplus-modules/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocCategoryWrapperImpl.java

@@ -15,8 +15,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-06-16T08:58:29+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
+    date = "2023-08-18T09:17:57+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
 )
 @Component
 public class DocCategoryWrapperImpl implements DocCategoryWrapper {

jeeplus-modules/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocTemplateWrapperImpl.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-06-16T08:58:29+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
+    date = "2023-08-18T09:17:57+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
 )
 @Component
 public class DocTemplateWrapperImpl implements DocTemplateWrapper {

jeeplus-modules/jeeplus-wps/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon May 22 14:22:17 GMT+08:00 2023
-version=9.0
-groupId=org.jeeplus
-artifactId=jeeplus-wps

jeeplus-modules/jeeplus-wps/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,23 +0,0 @@
-com\jeeplus\wps\ApplicationProperties.class
-com\jeeplus\wps\model\FileModel.class
-com\jeeplus\office\mapper\DocCategoryMapper.class
-com\jeeplus\wps\controller\WebOfficeController.class
-com\jeeplus\office\conroller\DocCategoryController.class
-com\jeeplus\office\conroller\DocTemplateController.class
-com\jeeplus\wps\controller\WpsOfficeController.class
-com\jeeplus\wps\utils\WpsUtils.class
-com\jeeplus\office\service\dto\DocTemplateDTO.class
-com\jeeplus\office\service\DocCategoryService.class
-com\jeeplus\office\mapper\DocTemplateMapper.class
-com\jeeplus\office\domain\DocCategory.class
-com\jeeplus\office\service\DocTemplateService.class
-com\jeeplus\office\service\dto\DocCategoryDTO.class
-com\jeeplus\wps\model\UrlModel.class
-com\jeeplus\office\service\mapstruct\DocTemplateWrapperImpl.class
-com\jeeplus\office\service\mapstruct\DocTemplateWrapper.class
-com\jeeplus\office\service\mapstruct\DocCategoryWrapper.class
-com\jeeplus\wps\controller\OauthController.class
-com\jeeplus\office\service\mapstruct\DocCategoryWrapperImpl.class
-com\jeeplus\wps\utils\WpsUtils$1.class
-com\jeeplus\JeeplusWpsApplication.class
-com\jeeplus\office\domain\DocTemplate.class

jeeplus-modules/jeeplus-wps/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,20 +0,0 @@
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\conroller\DocTemplateController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\mapstruct\DocCategoryWrapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\DocTemplateService.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\domain\DocCategory.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\ApplicationProperties.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\domain\DocTemplate.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\model\FileModel.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\mapper\DocTemplateMapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\model\UrlModel.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\mapstruct\DocTemplateWrapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\conroller\DocCategoryController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\JeeplusWpsApplication.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\DocCategoryService.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\controller\WebOfficeController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\controller\WpsOfficeController.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\dto\DocCategoryDTO.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\mapper\DocCategoryMapper.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\utils\WpsUtils.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\office\service\dto\DocTemplateDTO.java
-D:\java_project_test\new_jeeplus_cloud_SAAS_flowable\jp-cloud\jeeplus-modules\jeeplus-wps\src\main\java\com\jeeplus\wps\controller\OauthController.java

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/java/com/xxl/job/executor/XxlJobExecutorApplication.java

@@ -1,15 +1,17 @@
 package com.xxl.job.executor;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
 
 /**
  * @author xuxueli 2018-10-28 00:38:13
  */
 @SpringBootApplication
 @EnableFeignClients
+@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class XxlJobExecutorApplication {
 
     public static void main(String[] args) {