1

.idea/compiler.xml

@@ -7,17 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="huigou-xt" />
         <module name="topsun" />
         <module name="topsun-xt" />
-        <module name="huigou-xt" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="SSRF" target="1.5" />
-      <module name="ssrf-Project" target="1.5" />
-      <module name="test" target="1.8" />
-      <module name="topsun-project" target="1.5" />
-      <module name="topsun-Project" target="1.5" />
-    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file

.idea/encodings.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/huigou-xt/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/test/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/test/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/topsun-xt/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/topsun/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/topsun/src/main/resources" charset="UTF-8" />

.idea/misc.xml

@@ -16,11 +16,6 @@
         <option value="$PROJECT_DIR$/topsun-xt/pom.xml" />
       </list>
     </option>
-    <option name="ignoredFiles">
-      <set>
-        <option value="$PROJECT_DIR$/test/pom.xml" />
-      </set>
-    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/proofing/WorkInstrcutionApply.jsp → topsun-xt/src/main/webapp/biz/topsun/proofing/workInstrcutionApply.jsp

@@ -8,7 +8,7 @@
 <div class="container-fluid" style="padding: 10px;">
     <form class="hg-form" method="post" action="" id="submitForm">
         <div><h3>基本信息</h3></div>
-        <div style="margin: 22px;border: 1px solid black;">
+        <div style="margin: 10px;">
             <div class="hg-form-cols">
                 <x:inputC name="proofingMakeNo"  label="指导书编号" labelCol="2" fieldCol="2"/>
 
@@ -43,7 +43,6 @@
                           fieldCol="2"/>
                 <x:inputC name="isBodyColor"  label="是否不考虑形体配色" maxLength="32" labelCol="2"
                           fieldCol="2"/>
-
             </div>
         </div>
 

topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyApplication.java

@@ -17,7 +17,7 @@ public interface ProofingApplyApplication {
 
     List<ProofingApply>  getProofingApplyList();
 
-    ProofingApply getProofingApplyByProofingApplyNo(String proofingApplyNo);
+    ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo);
 
     /**
      * 根据ProofingApply获得样品和产品外观信息

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java

@@ -121,8 +121,9 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     }
 
     @Override
-    public ProofingApply getProofingApplyByProofingApplyNo(String proofingApplyNo) {
-        return proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
+    public ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
+        ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
+        return this.getProofingApplyAndLookedVoByPAId(proofingApply.getId());
     }
 
 

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.proofing.controller;
 
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
+import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
 
 import com.huigou.topsun.proofing.service.ProofingMakeService;
@@ -94,10 +95,14 @@ public class ProofingMakeController extends CommonController {
         return success();
     }
 
+    /**
+     * 根据测试单号回显相关数据
+     * @return
+     */
     public String queryProofingApply(){
         SDO sdo = this.getSDO();
         String proofingApplyNo = sdo.getString("proofingApplyNo");
-        ProofingApply proofingApply = proofingApplyApplication.getProofingApplyByProofingApplyNo(proofingApplyNo);
-        return toResult(proofingApply);
+        ProofingApplyAndLookedVo proofingApplyAndLookedVo = proofingApplyApplication.getProofingApplyByProofingApplyNo(proofingApplyNo);
+        return toResult(proofingApplyAndLookedVo);
     }
 }

topsun/topsun.iml

@@ -5,6 +5,7 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <datasource-mapping>
+          <factory-entry name="Entities" />
           <factory-entry name="topsun" />
         </datasource-mapping>
         <naming-strategy-map />