合同表单优化

zjugis-business/src/main/java/com/zjugis/business/flow/contract/service/FlowContractService.java

@@ -103,7 +103,7 @@ public class FlowContractService {
         if(StringUtils.isNotBlank(entity.getProjectId())){
             Project project = projectService.selectById(entity.getProjectId());
             map.put("projectTypeCode",projectTypeService.topCode(project.getProjectTypeId()));
-            map.put("xzqh",districtApi.getQhByJoincode(project.getXzqdm()));
+            map.put("xzqh",districtApi.getQhByJoincode(project.getXzqdm()).getCheckedData());
             map.put("project",project);
         }
         if(StringUtils.isNotBlank(entity.getParentId())){

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -215,6 +215,7 @@ public class ContractServiceImpl implements ContractService{
             Contract contract = new Contract();
             contract.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
             contract.setProjectId(projectId);
+            contract.setIsBusinessUnit(0);
             contract.setApplicantName(userResp.getCheckedData().getNickname());
             contract.setApplicantId(userId);
             contract.setContractType(ContractConstants.TYPE_MAIN_CONTRACT);

zjugis-business/src/main/resources/mapper/oracle/ProjectTypeMapper.xml

@@ -14,7 +14,7 @@
         (SELECT id,pid,type_code
         FROM project_type
         START WITH id = #{id,jdbcType=VARCHAR}
-        CONNECT BY PRIOR id = pid)
+        CONNECT BY PRIOR pid = id)
         WHERE pid IS NULL OR pid = ''
     </select>
 </mapper>

zjugis-business/src/main/resources/templates/FlowContract/apply.ftl

@@ -213,7 +213,8 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                           <div class="form-group">
                                               <div class="form-item" style="margin: 10px 0;">
                                                   <div class="z-comp-input" name="contract$taxZhsl">
-                                                      <input type="text" value="${formEntity.taxZhsl!}" />
+
+                                                      <input type="text" value="${(formEntity.taxZhsl?string('0.#####'))!}" />
                                                   </div>
                                               </div>
                                           </div>
@@ -222,7 +223,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                           <div class="form-group">
                                               <div class="form-item" style="margin: 10px 0;">
                                                   <div class="z-comp-input" name="contract$taxBhsze">
-                                                      <input type="text" value="${formEntity.taxBhsze!}" />
+                                                      <input type="text" value="${(formEntity.taxBhsze?string('0.#####'))!}" />
                                                   </div>
                                               </div>
                                           </div>

zjugis-business/src/main/resources/templates/FlowContract/js/apply.js

@@ -152,7 +152,6 @@
         } else {
             zhsl = (1 - parseFloat(bhsje_total / htje)).toFixed(2);
         }
-        $('[name="contract$contractAmount"] input').val(zhsl);
     }
 
     function initAreaManager(){