diff --git a/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiHistoricController.java b/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiHistoricController.java
index dd5267d..9bdd0e4 100644
--- a/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiHistoricController.java
+++ b/easy-activiti/src/main/java/com/easy/admin/activiti/controller/ActivitiHistoricController.java
@@ -18,7 +18,7 @@ import java.util.List;
 @RestController
 @ResponseResult
 @RequestMapping("/api/auth/activiti/historic")
-public class ActivitiHistoricController {
+public class    ActivitiHistoricController {
 
     @Autowired
     private ActivitiHistoricService service;
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java
index b0a7d28..e7b249d 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java
@@ -54,6 +54,7 @@ public class HuzhouPlanController {
     public Result<IPage<HuzhouProjectinfoOV>> projectPlanPageList(HuzhouProjectinfo projectinfo,String newStage,
                                                                        @RequestParam(name="current", defaultValue="1") Integer pageNo,
                                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){
+
         IPage<HuzhouProjectinfoOV> infoPageList  =planinfoService.projectPlanPageList(projectinfo, pageNo, pageSize,newStage);
         return Result.OK(infoPageList);
     }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java
index 67e1a13..8bbaa02 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java
@@ -37,9 +37,19 @@ public class HuzhouPlaninfofileController {
 
     @PostMapping("/planUploadFile")
     public Result<?> planUploadFile(@RequestParam(value = "file",required = false)
-                                    MultipartFile[] files, @RequestParam(value = "planinfoid") String planinfoid) throws IOException {
+                                    MultipartFile[] files, @RequestParam(value = "planinfoid") String planinfoid,
+                                    @RequestParam(value = "approvalMoneyFieldsValue" ,required = false) String approvalMoneyFieldsValue,
+                                     @RequestParam(value = "contractMoneyFieldsValue" ,required = false) String contractMoneyFieldsValue) throws IOException {
 
-        planinfofileService.submitPlanUploadFile(files,planinfoid);
+        planinfofileService.submitPlanUploadFile(files,planinfoid,approvalMoneyFieldsValue,contractMoneyFieldsValue);
+        return  Result.ok();
+    }
+    @PostMapping("/planREUploadFile")
+    public Result<?> planREUploadFile(@RequestParam(value = "file")
+                                    MultipartFile[] files, @RequestParam(value = "planinfoid") String planinfoid
+                                    ) throws IOException {
+
+        planinfofileService.planREUploadFile(files,planinfoid);
         return  Result.ok();
     }
     //弃用
@@ -73,8 +83,10 @@ public class HuzhouPlaninfofileController {
                                      @RequestParam String planinfoid,
                                      @RequestParam String comment,
                                      @RequestParam(value = "modifyNum",required = false) String modifyNum,
-                                     @RequestParam(value = "adviceFile",required = false) MultipartFile[] adviceFiles) throws Exception {
-        planinfofileService.approvePlanFile(files,taskId,flag,planinfoid,comment,modifyNum,adviceFiles);
+                                     @RequestParam(value = "adviceFile",required = false) MultipartFile[] adviceFiles,
+                                     @RequestParam(value = "approvalMoneyFieldsValue" ,required = false) String approvalMoneyFieldsValue,
+                                     @RequestParam(value = "contractMoneyFieldsValue" ,required = false) String contractMoneyFieldsValue) throws Exception {
+        planinfofileService.approvePlanFile(files,taskId,flag,planinfoid,comment,modifyNum,adviceFiles,approvalMoneyFieldsValue,contractMoneyFieldsValue);
         return Result.ok();
 
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectinfoMoneyController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectinfoMoneyController.java
new file mode 100644
index 0000000..07f3b83
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectinfoMoneyController.java
@@ -0,0 +1,24 @@
+package com.easy.admin.modules.huzhou.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.easy.admin.common.api.vo.Result;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfoMoney;
+import com.easy.admin.modules.huzhou.service.IHuzhouProjectinfoMoneyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/huzhouProjectinfoMoney")
+public class HuzhouProjectinfoMoneyController {
+    @Autowired
+    private IHuzhouProjectinfoMoneyService huzhouProjectinfoMoneyService;
+    @GetMapping("/getProjectinfoMoneyInfo")
+    public Result<?> getProjectinfoMoneyInfo(String projectid){
+        HuzhouProjectinfoMoney byId = huzhouProjectinfoMoneyService.getById(projectid);
+        return Result.OK(byId);
+    }
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java
index f9e1aad..4aad3ca 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java
@@ -130,8 +130,10 @@ public class HuzhouUploadfileinfoController {
     }
     @PostMapping("/uploadURTFile")
     public Result<?> uploadURTFile(@RequestParam(value = "file")
-                                      MultipartFile[] files,@RequestParam(value = "planinfoid") String planinfoid) throws IOException {
-        uploadfileinfoService.submitURTFile(files, planinfoid,"6");
+                                      MultipartFile[] files,
+                                   @RequestParam(value = "planinfoid") String planinfoid,
+                                   @RequestParam(value = "urtEstimatedAmount") Double urtEstimatedAmount) throws IOException {
+        uploadfileinfoService.submitURTFile(files, planinfoid,urtEstimatedAmount,"6");
 
         return Result.OK("上传成功!!");
     }
@@ -141,8 +143,9 @@ public class HuzhouUploadfileinfoController {
                                     @RequestParam String flag,
                                     @RequestParam String projectid,
                                     @RequestParam String comment,
-                                    @RequestParam(value = "adviceFile",required = false) MultipartFile[] adviceFiles) throws IOException {
-        uploadfileinfoService.approveURTFile(files, taskId, flag, projectid, comment, adviceFiles);
+                                    @RequestParam(value = "adviceFile",required = false) MultipartFile[] adviceFiles,
+                                    @RequestParam(value = "urtEstimatedAmount") Double urtEstimatedAmount) throws IOException {
+        uploadfileinfoService.approveURTFile(files, taskId, flag, projectid, comment, adviceFiles,urtEstimatedAmount);
         return Result.OK("审批成功!!");
 
     }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java
index 7b7d449..c704cd2 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java
@@ -216,7 +216,7 @@ public class WorkflowController {
                 }
                 currentTaskName = currentTaskName.substring(0,currentTaskName.length()-1);
                 reshashMap.put("currentTaskName",currentTaskName);
-                WorkflowActionParamOV actionParam = workflowService.getActionParam(processInstanceId, taskList.get(0).getId(), "1");
+                WorkflowActionParamOV actionParam = workflowService.getActionParam(processInstanceId, reshashMap.get("taskId"), "1");
                 List<Select> buttons = actionParam.getButtons();
                 for (Select select:buttons
                 ) {
@@ -359,8 +359,12 @@ public class WorkflowController {
             hashMap.put("operator", assignee);
             String nickname="";
             if(StringUtils.isNotBlank(assignee)){
-                nickname = sysUserService.getById(assignee).getNickname();
+                SysUser user = sysUserService.getById(assignee);
+                nickname = user.getNickname();
+                String phoneNumber = user.getPhoneNumber();
+
                 hashMap.put("operator", nickname);
+                hashMap.put("operatorPhone", phoneNumber);
 
             }else{
                 continue;
@@ -465,38 +469,67 @@ public class WorkflowController {
                             Object variable = runtimeService.getVariable(processInstanceId, groupName);
                             if(variable instanceof String){
                                 String startUserid = (String)variable;
-                                String nickname = sysUserService.getById(startUserid).getNickname();
+                                SysUser user = sysUserService.getById(startUserid);
+                                String nickname = user.getNickname();
+                                String phoneNumber = user.getPhoneNumber();
 
                                 hashMap.put("operator", nickname);
+                                hashMap.put("operatorPhone", phoneNumber);
                             }else{
                                 List<String> variableValue = (List<String>)variable;
                                 String name = "";
+                                String phone = "";
                                 for (String id:variableValue
                                 ) {
-                                    String nickname = sysUserService.getById(id).getNickname();
+                                    SysUser user = sysUserService.getById(id);
+                                    String nickname = user.getNickname();
+                                    String phoneNumber = user.getPhoneNumber();
                                     name=name+nickname+",";
+                                    phone=phone+phoneNumber+",";
                                 }
                                 hashMap.put("operator", name.substring(0,name.length()-1));
+                                hashMap.put("operatorPhone", phone.substring(0,phone.length()-1));
+
+                                if(userTask.getName().equals("总咨询单位")){
+                                    hashMap.put("operatorPhone", "18478831015");
+
+                                }
                             }
 
                         }
                     }else{
-                        hashMap.put("operator", sysUserService.getById(assignee).getNickname());
+                        SysUser user = sysUserService.getById(assignee);
+                        String nickname = user.getNickname();
+                        String phoneNumber = user.getPhoneNumber();
+
+                        hashMap.put("operator", nickname);
+                        hashMap.put("operatorPhone", phoneNumber);
                     }
                 }else{
                     LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(SysUserRole::getRoleId,candidateGroups.get(0));
                     List<SysUserRole> sysUserRoles = userRoleMapper.selectList(queryWrapper);
                     String name="";
+                    String phone="";
                     if(sysUserRoles.size()>0){
                         for (SysUserRole userRole:sysUserRoles){
-                            name = name+sysUserService.getById(userRole.getUserId()).getNickname()+",";
+                            SysUser user = sysUserService.getById(userRole.getUserId());
+                            String nickname = user.getNickname();
+                            String phoneNumber = user.getPhoneNumber();
+                            name=name+nickname+",";
+                            phone=phone+phoneNumber+",";
                         }
                     }
                     if(StringUtils.isNotBlank(name)){
                         name=name.substring(0,name.length()-1);
+                        phone=phone.substring(0,phone.length()-1);
                     }
                     hashMap.put("operator", name);
+                    hashMap.put("operatorPhone", phone);
+                    if(userTask.getName().equals("总咨询单位")){
+                        hashMap.put("operatorPhone", "18478831015");
+
+                    }
                 }
                 Boolean isrecall = true;
                 for (HashMap<String,Object> hash: approvalEntityList) {
@@ -534,7 +567,11 @@ public class WorkflowController {
                     return d1.compareTo(d2);
                 })
                 .collect(Collectors.toList());
-
+        if(list.size()>0&&list.get(0).getProcessDefinitionId().contains("createURT")) {
+            sortedList.forEach(hashMap -> {
+                hashMap.put("operatorPhone", "");
+            });
+        }
         return Result.OK(sortedList);
     }
     @GetMapping("/getProcessInstanceIdByProid")
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMoneyMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMoneyMapper.java
new file mode 100644
index 0000000..24a0914
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMoneyMapper.java
@@ -0,0 +1,7 @@
+package com.easy.admin.modules.huzhou.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfoMoney;
+
+public interface HuzhouProjectinfoMoneyMapper extends BaseMapper<HuzhouProjectinfoMoney> {
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
index 3de6bfb..1244887 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
@@ -152,25 +152,25 @@ order by create_date desc
         <where>
             <include refid="selectAuthSql"/>
             <if test="info.projectName!=null and info.projectName!=''">
-                <bind name="tempStr" value="'%' + info.projectName + '%'" />
-                and u.project_name like  #{tempStr}
+                <bind name="projectName" value="'%' + info.projectName + '%'" />
+                and u.project_name like  #{projectName}
             </if>
 
             <if test="info.adminDivision!=null and info.adminDivision!=''">
-                <bind name="tempStr" value="'%' + info.adminDivision + '%'" />
-                and u.admin_division like  #{tempStr}
+                <bind name="adminDivision" value="'%' + info.adminDivision + '%'" />
+                and u.admin_division like  #{adminDivision}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.workplaceProperties!=null and info.workplaceProperties!=''">
-                <bind name="tempStr" value="'%' + info.workplaceProperties + '%'" />
-                and u.workplace_properties like  #{tempStr}
+                <bind name="workplaceProperties" value="'%' + info.workplaceProperties + '%'" />
+                and u.workplace_properties like  #{workplaceProperties}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.reformName!=null and info.reformName!=''">
                 and u.reform_name =  #{info.reformName}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml
index fd143ce..7a897fe 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml
@@ -6,12 +6,12 @@
         <where>
            a.projectid = #{info.projectid}
             <if test="info.documentName!=null and info.documentName!=''">
-                <bind name="tempStr" value="'%' + info.documentName + '%'" />
-                and  a.document_name like  #{tempStr}
+                <bind name="documentName" value="'%' + info.documentName + '%'" />
+                and  a.document_name like  #{documentName}
             </if>
             <if test="info.projectName!=null and info.projectName!=''">
-                <bind name="tempStr" value="'%' + info.projectName + '%'" />
-                and b.project_name like  #{tempStr}
+                <bind name="projectName" value="'%' + info.projectName + '%'" />
+                and b.project_name like  #{projectName}
             </if>
         </where>
         order by b.project_name,a.create_date
@@ -23,25 +23,25 @@
             and u.report_type is not null
 
             <if test="info.projectName!=null and info.projectName!=''">
-                <bind name="tempStr" value="'%' + info.projectName + '%'" />
-                and u.project_name like  #{tempStr}
+                <bind name="projectName" value="'%' + info.projectName + '%'" />
+                and u.project_name like  #{projectName}
             </if>
 
             <if test="info.adminDivision!=null and info.adminDivision!=''">
-                <bind name="tempStr" value="'%' + info.adminDivision + '%'" />
-                and u.admin_division like  #{tempStr}
+                <bind name="adminDivision" value="'%' + info.adminDivision + '%'" />
+                and u.admin_division like  #{adminDivision}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.workplaceProperties!=null and info.workplaceProperties!=''">
-                <bind name="tempStr" value="'%' + info.workplaceProperties + '%'" />
-                and u.workplace_properties like  #{tempStr}
+                <bind name="workplaceProperties" value="'%' + info.workplaceProperties + '%'" />
+                and u.workplace_properties like  #{workplaceProperties}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.reformName!=null and info.reformName!=''">
                 and u.reform_name =  #{info.reformName}
@@ -63,25 +63,25 @@
             and u.report_type is null
 
             <if test="info.projectName!=null and info.projectName!=''">
-                <bind name="tempStr" value="'%' + info.projectName + '%'" />
-                and u.project_name like  #{tempStr}
+                <bind name="projectName" value="'%' + info.projectName + '%'" />
+                and u.project_name like  #{projectName}
             </if>
 
             <if test="info.adminDivision!=null and info.adminDivision!=''">
-                <bind name="tempStr" value="'%' + info.adminDivision + '%'" />
-                and u.admin_division like  #{tempStr}
+                <bind name="adminDivision" value="'%' + info.adminDivision + '%'" />
+                and u.admin_division like  #{adminDivision}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.workplaceProperties!=null and info.workplaceProperties!=''">
-                <bind name="tempStr" value="'%' + info.workplaceProperties + '%'" />
-                and u.workplace_properties like  #{tempStr}
+                <bind name="workplaceProperties" value="'%' + info.workplaceProperties + '%'" />
+                and u.workplace_properties like  #{workplaceProperties}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.reformName!=null and info.reformName!=''">
                 and u.reform_name =  #{info.reformName}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java
index b10b210..e094965 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java
@@ -150,8 +150,10 @@ public class HuzhouProjectinfo extends BaseEntity {
     private  String reportType;
 
     private  String type;
-
-
+    /**
+     * 联合技术审查估算金额
+     */
+    private Double urtEstimatedAmount;
 
 }
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfoMoney.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfoMoney.java
new file mode 100644
index 0000000..cf7e658
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfoMoney.java
@@ -0,0 +1,74 @@
+package com.easy.admin.modules.huzhou.entity;
+
+import com.easy.admin.modules.huzhou.entity.BaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (HuzhouProjectinfomoney)实体类
+ *
+ * @author makejava
+ * @since 2024-08-22 10:46:12
+ */
+
+@Data
+public class HuzhouProjectinfoMoney extends BaseEntity implements Serializable  {
+    private static final long serialVersionUID = -90624078449783977L;
+    /**
+     * 项目id
+     */
+    private String id;
+    /**
+     * 立项审批总投资
+     */
+    private Double approvalTotalMoney;
+    /**
+     * 立项审批自筹资金
+     */
+    private Double approvalSelfMoney;
+    /**
+     * 立项审批中央资金
+     */
+    private Double approvalCentralMoney;
+    /**
+     * 立项审批省级资金
+     */
+    private Double approvalProvincialMoney;
+    /**
+     * 立项审批市级资金
+     */
+    private Double approvalCityMoney;
+    /**
+     * 立项审批区县级资金
+     */
+    private Double approvalCountyMoney;
+    /**
+     * 合同签订总投资
+     */
+    private Double contractTotalMoney;
+    /**
+     * 合同签订自筹资金
+     */
+    private Double contractSelfMoney;
+    /**
+     * 合同签订中央资金
+     */
+    private Double contractCentralMoney;
+    /**
+     * 合同签订省级资金
+     */
+    private Double contractProvincialMoney;
+    /**
+     * 合同签订市级资金
+     */
+    private Double contractCityMoney;
+    /**
+     * 合同签订区县级资金
+     */
+    private Double contractCountyMoney;
+
+
+
+}
+
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java
index f0c6a72..c662fe1 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java
@@ -11,11 +11,12 @@ public interface IHuzhouPlaninfofileService extends IService<HuzhouPlaninfofile>
     Page<HuzhouPlaninfofile> getplanFilePageList(HuzhouPlaninfofile planinfofile, Integer pageNo, Integer pageSize);
     void modifyStatusByPlaninfoid(String status,String planinfo);
 
-    void submitPlanUploadFile(MultipartFile[] files, String planinfoid) throws IOException;
+    void submitPlanUploadFile(MultipartFile[] files, String planinfoid,String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException;
 
-    void approvePlanFile(MultipartFile[] files, String taskId, String flag, String planinfoid, String comment, String modifyNum,MultipartFile[] adviceFiles) throws IOException;
+    void approvePlanFile(MultipartFile[] files, String taskId, String flag, String planinfoid, String comment, String modifyNum,MultipartFile[] adviceFiles,String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException;
 
     String getProcessName(String pid);
 
 
+    void planREUploadFile(MultipartFile[] files, String planinfoid) throws IOException;
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoMoneyService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoMoneyService.java
new file mode 100644
index 0000000..ee2c90e
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoMoneyService.java
@@ -0,0 +1,7 @@
+package com.easy.admin.modules.huzhou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfoMoney;
+
+public interface IHuzhouProjectinfoMoneyService extends IService<HuzhouProjectinfoMoney> {
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java
index 827ad0c..3112481 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java
@@ -29,7 +29,7 @@ public interface IHuzhouUploadfileinfoService extends IService<HuzhouUploadfilei
      */
     IPage<HuzhouUploadfileinfo> getuploacFilePageListOk(HuzhouUploadfileinfo uploadfileinfo, Integer pageNo, Integer pageSize);
 
-    void submitURTFile(MultipartFile[] files, String planinfoid, String s) throws IOException;
+    void submitURTFile(MultipartFile[] files, String planinfoid, Double urtEstimatedAmount,String s) throws IOException;
 
-    void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles) throws IOException;
+    void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles,Double urtEstimatedAmount) throws IOException;
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java
index cb6e8b1..16300b5 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java
@@ -61,7 +61,6 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
     public void submitMergeProject(HuzhouMergesplitinfoVo mergesplitinfoVo) {
         HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
         BeanUtils.copyProperties(mergesplitinfoVo, huzhouProjectinfo);
-        userprojectService.saveFromProject(huzhouProjectinfo,"0");
         huzhouProjectinfo.setCityMoney(0.0);
         huzhouProjectinfo.setCountyMoney(0.0);
         huzhouProjectinfo.setProvincialMoney(0.0);
@@ -73,6 +72,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
         huzhouProjectinfo.setPayamount2025Money(0.0);
         huzhouProjectinfo.setStage("-1");//0
         projectinfoService.save(huzhouProjectinfo);
+        userprojectService.saveFromProject(huzhouProjectinfo, "0");
         for (String oldprojectid :mergesplitinfoVo.getProjectids()
              ) {
             HuzhouProjectinfo projectinfo = projectinfoService.getById(oldprojectid);
@@ -151,7 +151,6 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
         for (HuzhouMergesplitinfoVo mergesplitinfoVo : mergesplitinfoVoList) {
             HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
             BeanUtils.copyProperties(mergesplitinfoVo, huzhouProjectinfo);
-            userprojectService.saveFromProject(huzhouProjectinfo, "0");
             huzhouProjectinfo.setCityMoney(0.0);
             huzhouProjectinfo.setCountyMoney(0.0);
             huzhouProjectinfo.setProvincialMoney(0.0);
@@ -163,6 +162,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             huzhouProjectinfo.setPayamount2025Money(0.0);
             huzhouProjectinfo.setStage("-1");//0
             projectinfoService.save(huzhouProjectinfo);
+            userprojectService.saveFromProject(huzhouProjectinfo, "0");
             for (String oldprojectid :mergesplitinfoVo.getProjectids()
             ) {
                 HuzhouProjectinfo projectinfo = projectinfoService.getById(oldprojectid);
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
index 35c5f3a..462d402 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
@@ -13,11 +13,15 @@ import com.easy.admin.common.api.vo.Result;
 import com.easy.admin.common.core.exception.EasyException;
 import com.easy.admin.modules.huzhou.dao.HuzhouContractinfoMapper;
 import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper;
+import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMoneyMapper;
 import com.easy.admin.modules.huzhou.entity.*;
 import com.easy.admin.modules.huzhou.service.*;
+import com.easy.admin.modules.huzhou.vo.HuzhouMergesplitinfoVo;
 import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
 import com.easy.admin.sys.model.SysDict;
 import com.easy.admin.sys.service.SysDictService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -55,6 +59,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
     private HuzhouPlaninfofileMapper planinfofileMapper;
     @Autowired
     private HuzhouContractinfoMapper contractinfoMapper;
+    @Autowired
+    private HuzhouProjectinfoMoneyMapper projectinfoMoneyMapper;
 //    private String[] names ={"可研技术审查报告（初稿）确认","可研技术审查报告（复审稿）确认","可研技术审查报告（终稿）确认","造价评估报告确认","可行性研究报告审批（发改）","合同签订","首付支付","初验阶段","终验阶段","初步设计审批"};
     private String[] names ={"合同签订","首付支付","初验阶段","终验阶段","初步设计审批"};
 
@@ -83,7 +89,23 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
     }
 
     @Override
-    public void submitPlanUploadFile(MultipartFile[] files, String planinfoid) throws IOException {
+    public void submitPlanUploadFile(MultipartFile[] files, String planinfoid,String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException {
+        //立项审批和合同签订 金额输入
+        HuzhouProjectinfoMoney huzhouProjectinfoMoney = new HuzhouProjectinfoMoney();
+        if(approvalMoneyFieldsValue!=null){
+            ObjectMapper mapper = new ObjectMapper();
+            huzhouProjectinfoMoney = mapper.readValue(approvalMoneyFieldsValue, new TypeReference<HuzhouProjectinfoMoney>(){});
+            projectinfoMoneyMapper.insert(huzhouProjectinfoMoney);
+        } else if (contractMoneyFieldsValue!=null) {
+            ObjectMapper mapper = new ObjectMapper();
+            huzhouProjectinfoMoney = mapper.readValue(contractMoneyFieldsValue, new TypeReference<HuzhouProjectinfoMoney>(){});
+            HuzhouProjectinfoMoney data = projectinfoMoneyMapper.selectById(huzhouProjectinfoMoney.getId());
+            if(data!=null){
+                projectinfoMoneyMapper.updateById(huzhouProjectinfoMoney);
+            }else{
+                projectinfoMoneyMapper.insert(huzhouProjectinfoMoney);
+            }
+        }
         //检查是否可提交
         HuzhouPlaninfo planinfo = planinfoService.getById(planinfoid);
         String taskLevel = planinfo.getTaskLevel();
@@ -347,7 +369,20 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
     }
 
     @Override
-    public void approvePlanFile(MultipartFile[] files, String taskId, String flag, String planinfoid, String comment, String modifyNum,MultipartFile[] adviceFiles) throws IOException {
+    public void approvePlanFile(MultipartFile[] files, String taskId, String flag,
+                                String planinfoid, String comment, String modifyNum,MultipartFile[] adviceFiles,
+                                String approvalMoneyFieldsValue,String contractMoneyFieldsValue) throws IOException {
+        //立项审批和合同签订 金额输入
+        HuzhouProjectinfoMoney huzhouProjectinfoMoney = new HuzhouProjectinfoMoney();
+        if(approvalMoneyFieldsValue!=null){
+            ObjectMapper mapper = new ObjectMapper();
+            huzhouProjectinfoMoney = mapper.readValue(approvalMoneyFieldsValue, new TypeReference<HuzhouProjectinfoMoney>(){});
+            projectinfoMoneyMapper.updateById(huzhouProjectinfoMoney);
+        } else if (contractMoneyFieldsValue!=null) {
+            ObjectMapper mapper = new ObjectMapper();
+            huzhouProjectinfoMoney = mapper.readValue(contractMoneyFieldsValue, new TypeReference<HuzhouProjectinfoMoney>(){});
+            projectinfoMoneyMapper.updateById(huzhouProjectinfoMoney);
+        }
         WorkFlow workFlow = workflowService.approveProjectInfo(taskId, flag, comment);
         LambdaQueryWrapper<HuzhouProcessinfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HuzhouProcessinfo::getProjectid,planinfoid);
@@ -408,6 +443,14 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             HuzhouPlaninfo byId = planinfoService.getById(planinfoid);
             String taskName = StrUtil.trim(byId.getTaskName());
             if("可研报告终稿编制".equals(taskName)){
+                //查询是否已有完成的流程。有两个以上
+                queryWrapper.clear();
+                queryWrapper.eq(HuzhouProcessinfo::getProjectid,planinfoid);
+                processinfos = processinfoService.list(queryWrapper);
+
+                if(processinfos.size()>=2){
+                    return;
+                }
                 //获取造价评估报告确认节点id
                 String projectId1 = byId.getProjectId();
                 LambdaQueryWrapper<HuzhouPlaninfo> wrapper = new LambdaQueryWrapper<>();
@@ -465,4 +508,72 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         String name = processinfoService.getProcessName(pid);
         return name;
     }
+
+    @Override
+    public void planREUploadFile(MultipartFile[] files, String planinfoid) throws IOException {
+        //检查是否可提交
+        HuzhouPlaninfo planinfo = planinfoService.getById(planinfoid);
+        String taskLevel = planinfo.getTaskLevel();
+        List<HuzhouPlaninfo> childPlanList = planinfoService.queryChildPlan(planinfo.getProjectId(), planinfo.getTaskLevel(),"0,1");
+        if(childPlanList.size()>0){
+            throw  new EasyException("存在未完成(审批中)的子项。当前阶段不允许提交文件");
+        }
+        planinfoService.saveOrModifyPlanUploadFile(files,planinfoid,"2","1");
+        String taskName = planinfo.getTaskName();
+        taskName=StrUtil.trim(taskName);
+        String projectId = planinfoService.getById(planinfoid).getProjectId();
+        HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
+        String superLeader = "";
+        //如果项目信息为空说明是子项目
+        if(huzhouProjectinfo==null){
+            HuzhouSubProjectinfo byId = subProjectinfoService.getById(projectId);
+            superLeader = byId.getSuperLeader();
+        }else {
+            superLeader=huzhouProjectinfo.getSuperLeader();
+        }
+        //获取上级指导室中文名称
+        SysDict dict = sysDictService.getDictByCode("superLeader", superLeader);
+        String dictName = dict.getName();
+        //上级指导室中文名称查询角色有哪些人
+        List<HashMap<String, String>> userDictByRoles = userService.getUserDictByRoles(dictName);
+        ArrayList<String> strings = new ArrayList<>();
+        if(userDictByRoles==null||userDictByRoles.size()==0){
+            String error = "任务牵头处室"+dictName+"负责人未找到";
+            throw new EasyException(error);
+        }
+        for (HashMap<String, String> map:userDictByRoles
+        ) {
+            String userid = map.get("value");
+            strings.add(userid);
+        }
+        if ("可研报告初稿编制".equals(taskName)) {
+            //审批通过但是要开始下一阶段流程
+            HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
+            huzhouPlaninfo.setId(planinfoid);
+            huzhouPlaninfo.setIsfinish("2");
+            huzhouPlaninfo.setActualStartTime(new Date());
+            huzhouPlaninfo.setActualEndTime(new Date());
+            planinfoService.updateById(huzhouPlaninfo);
+
+        } else if ("可研报告终稿编制".equals(taskName)) {
+            //finalFeasibilityReportDraft
+            WorkFlow workFlow = workflowService.createFlow("finalFeasibilityReportDraft",planinfoid);
+            Task task = workFlow.getTask();
+            String taskId = task.getId();
+            String processInstanceId = workFlow.getProcessInstanceId();
+            Map<String, Object> variables = new HashMap<>();
+            variables.put("taskLeadingDepartment",strings);
+            runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第四个人变量信息
+            //发起人节点处理
+            taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过
+            String comment = "同意";
+            taskService.addComment(taskId,processInstanceId,comment);//添加审批意见
+            taskService.complete(taskId, variables);
+            HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
+            huzhouPlaninfo.setId(planinfoid);
+            huzhouPlaninfo.setIsfinish("1");
+            huzhouPlaninfo.setActualStartTime(new Date());
+            planinfoService.updateById(huzhouPlaninfo);
+        }
+    }
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoMoneyServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoMoneyServiceImpl.java
new file mode 100644
index 0000000..a1d840b
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoMoneyServiceImpl.java
@@ -0,0 +1,25 @@
+package com.easy.admin.modules.huzhou.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.easy.admin.modules.huzhou.dao.HuzhouChangefieldmanageMapper;
+import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMoneyMapper;
+import com.easy.admin.modules.huzhou.entity.HuzhouChangefieldmanage;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfoMoney;
+import com.easy.admin.modules.huzhou.service.IHuzhouChangefieldmanageService;
+import com.easy.admin.modules.huzhou.service.IHuzhouProjectinfoMoneyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+
+public class HuzhouProjectinfoMoneyServiceImpl extends ServiceImpl<HuzhouProjectinfoMoneyMapper, HuzhouProjectinfoMoney> implements IHuzhouProjectinfoMoneyService {
+
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
index 0b8d6ae..d2feb6f 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
@@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.easy.admin.auth.model.SysUser;
 import com.easy.admin.auth.service.SysUserService;
 import com.easy.admin.common.util.CommonUtils;
-import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper;
-import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper;
-import com.easy.admin.modules.huzhou.dao.HuzhouProcessinfoMapper;
-import com.easy.admin.modules.huzhou.dao.HuzhouUploadfileinfoMapper;
+import com.easy.admin.modules.huzhou.dao.*;
 import com.easy.admin.modules.huzhou.entity.*;
 import com.easy.admin.modules.huzhou.service.IHuzhouPlaninfoService;
 import com.easy.admin.modules.huzhou.service.IHuzhouProcessinfoService;
@@ -69,6 +66,8 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
     private HuzhouPlaninfoMapper planinfoMapper;
     @Autowired
     private HuzhouPlaninfofileMapper planinfofileMapper;
+    @Autowired
+    private HuzhouProjectinfoMapper huzhouProjectinfoMapper;
 
 
     public void modifyUploadFile(MultipartFile[] files, String projectid, String stage) throws IOException {
@@ -192,13 +191,36 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
     }
 
     @Override
-    public void submitURTFile(MultipartFile[] files, String planinfoid, String s) throws IOException {
+    public void submitURTFile(MultipartFile[] files, String planinfoid, Double urtEstimatedAmount,String s) throws IOException {
         HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
         huzhouPlaninfo.setId(planinfoid);
         huzhouPlaninfo.setIsfinish("1");
         huzhouPlaninfo.setActualStartTime(new Date());
         planinfoMapper.updateById(huzhouPlaninfo);
-        WorkFlow workFlow = workflowService.createFlow("createURT", planinfoid);//创建流程
+        HuzhouPlaninfo planinfo = planinfoMapper.selectById(planinfoid);
+        String projectId = planinfo.getProjectId();
+        //更新项目的联合技术审查估算金额
+        HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
+        huzhouProjectinfo.setId(projectId);
+        huzhouProjectinfo.setUrtEstimatedAmount(urtEstimatedAmount);
+        huzhouProjectinfoMapper.updateById(huzhouProjectinfo);
+        //
+        String adminDivision = huzhouProjectinfoMapper.selectById(projectId).getAdminDivision();
+        WorkFlow workFlow=null;
+        if(adminDivision.equals("市本级")){
+            workFlow = workflowService.createFlow("createURT", planinfoid);//创建流程createURT
+
+        }else{
+//            workFlow = workflowService.createFlow("createURT2", planinfoid);//创建流程createURT2
+//            processinfoService.modifyStatusByProjectId(planinfoid,"2",processName);
+            this.modifyUploadFileByURT(files,planinfoid,"1","1");
+            HuzhouPlaninfo huzhouPlaninfo2 = new HuzhouPlaninfo();
+            huzhouPlaninfo2.setId(planinfoid);
+            huzhouPlaninfo2.setIsfinish("2");
+            huzhouPlaninfo2.setActualEndTime(new Date());
+            planinfoMapper.updateById(huzhouPlaninfo2);
+            return;
+        }
         String taskId = workFlow.getTask().getId();
         String processInstanceId = workFlow.getProcessInstanceId();
         taskService.setVariableLocal(taskId, "approvalStatue", "1");//添加审批状态 通过
@@ -208,15 +230,28 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
 //        saveFileAndFileInfo(files, planinfoid, s);
         this.modifyUploadFileByURT(files,planinfoid,"1","1");
 
+
     }
 
     @Override
-    public void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles) throws IOException {
+    public void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles,Double urtEstimatedAmount) throws IOException {
 
+        HuzhouPlaninfo planinfo = planinfoMapper.selectById(projectid);
+        String projectId = planinfo.getProjectId();
+        String adminDivision = huzhouProjectinfoMapper.selectById(projectId).getAdminDivision();
+        HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
+        huzhouProjectinfo.setId(projectId);
+        huzhouProjectinfo.setUrtEstimatedAmount(urtEstimatedAmount);
+        huzhouProjectinfoMapper.updateById(huzhouProjectinfo);
 
         LambdaQueryWrapper<HuzhouProcessinfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HuzhouProcessinfo::getProjectid,projectid);
-        queryWrapper.eq(HuzhouProcessinfo::getProcessName,"createURT");
+        if(!adminDivision.equals("市本级")){
+            queryWrapper.eq(HuzhouProcessinfo::getProcessName,"createURT2");//createURT2
+        }else{
+            queryWrapper.eq(HuzhouProcessinfo::getProcessName,"createURT");
+
+        }
         queryWrapper.eq(HuzhouProcessinfo::getProcessstatus,"1");
         List<HuzhouProcessinfo> processinfos = processinfoService.list(queryWrapper);
         String processName = processinfos.get(0).getProcessName();
@@ -224,6 +259,7 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
             this.modifyUploadFileByURT(files,projectid,"2","1");
 
         }
+
         //意见文件
         if(adviceFiles!=null){
             this.modifyUploadFileByURT(adviceFiles,projectid,"2","2");
@@ -238,6 +274,9 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
             huzhouPlaninfo.setActualEndTime(new Date());
             planinfoMapper.updateById(huzhouPlaninfo);
         }else{
+            if(!adminDivision.equals("市本级")){
+                return;
+            }
             //如果流程未完成，检查流程是否被拒绝退回，退回后，之前同意的系统默认同意
             List<Task> tasks = taskService.createTaskQuery()
                     .processInstanceId(workFlow.getProcessInstanceId())
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java
index 10ae91f..325effe 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java
@@ -201,7 +201,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
                        List<HistoricTaskInstance> filteredList = list.stream()
                                     .filter(taskl -> taskl.getAssignee() != null && !taskl.getAssignee().equals(currentLoginuserId)&&taskl.getDeleteReason()==null)
                                     .collect(Collectors.toList());
-                       if(filteredList.size()==0){
+
+                       if(filteredList.size()==0&&!taskInstance.getProcessDefinitionId().contains("createURT")){
                            Select select = new Select();
                            select.setLabel("撤回");
                            select.setValue("2");