瀏覽代碼

Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

xiahan 10 月之前
父節點
當前提交
87e07dced7

+ 3 - 0
cx-question/cx-question-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ExportServiceImpl.java

@@ -93,6 +93,9 @@ public class ExportServiceImpl implements ExportService {
         put("spa", SrmIssuesListDo::getSpa);
         put("TEAMMEMBERS", SrmIssuesListDo::getTeammembers);
         put("FOLLOWUPDAYS", SrmIssuesListDo::getFollowupdays);
+        put("BATCHNUMBER", SrmIssuesListDo::getBatchnumber);
+        put("SPECIFICATIONS", SrmIssuesListDo::getSpecifications);
+        put("ALLOWSTATUS", SrmIssuesListDo::getAllowstatus);
     }};
     // 日期
     public static final List<String> DATE_KEY = new ArrayList<String>() {{

+ 16 - 0
cx-question/cx-question-entity/src/main/java/com/rongwei/bsentity/domin/SrmIssuesListDo.java

@@ -270,4 +270,20 @@ public class SrmIssuesListDo extends BaseDo implements Serializable {
     private String undetectedanalysisimgurl;
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 批号
+     */
+    private String batchnumber;
+
+    /**
+     * 规格(毫米)
+     */
+    private String specifications;
+
+
+    /**
+     * 合金状态
+     */
+    private String allowstatus;
 }

二進制
cx-question/cx-question-server/src/main/resources/template/ProblemTrackingAndResolution.docx