Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms…

Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle_sherlock

atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java

@@ -146,7 +146,7 @@ public class TemplateServiceImpl extends AbstractService {
 
         TemplateAndGroupDbDto templateDb = templateMapper.getTemplateAndGroupById(param.getId());
 
-        if (templateDb == null) {
+            if (templateDb == null) {
             result.setResult(false);
             result.setResultMsg("TemplateNotExist");
             return result;

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -3,6 +3,7 @@ package pwc.taxtech.atms.vat.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
+import org.reflections.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -266,10 +267,10 @@ public class ReportServiceImpl {
                     periodTemplate.setUpdateTime(template.getUpdateTime());
                     periodTemplate.setIsSystemType(template.getIsSystemType());
                     periodTemplate.setIsActiveAssociation(template.getIsActiveAssociation());
-                    periodTemplate.setParentId(template.getParentId());
+                    periodTemplate.setParentId(Utils.isEmpty(template.getParentId()) ? null : template.getParentId());
                     periodTemplate.setTemplateId(template.getId());
-                    periodTemplate.setCreateBy(template.getCreateBy());
-                    periodTemplate.setUpdateBy(template.getUpdateBy());
+                    periodTemplate.setCreateBy(Utils.isEmpty(template.getCreateBy()) ? "admin" : template.getCreateBy());
+                    periodTemplate.setUpdateBy(Utils.isEmpty(template.getUpdateBy()) ? "admin" : template.getUpdateBy());
                     periodTemplate.setProjectId(projectId);
                     periodTemplateList.add(periodTemplate);
                     logger.debug("template copy end,used time: " + (System.currentTimeMillis() - startTime) + " ms");
@@ -304,8 +305,8 @@ public class ReportServiceImpl {
                     periodCellTemplate.setDataType(cellTemplate.getDataType());
                     periodCellTemplate.setIsReadOnly(cellTemplate.getIsReadOnly() ? 1 : 0);
                     periodCellTemplate.setCopyFromId(cellTemplate.getCopyFromId());
-                    periodCellTemplate.setCreateBy(cellTemplate.getCreateBy());
-                    periodCellTemplate.setUpdateBy(cellTemplate.getUpdateBy());
+                    periodCellTemplate.setCreateBy(Utils.isEmpty(cellTemplate.getCreateBy()) ? "admin" : cellTemplate.getCreateBy());
+                    periodCellTemplate.setUpdateBy(Utils.isEmpty(cellTemplate.getUpdateBy()) ? "admin" : cellTemplate.getUpdateBy());
                     periodCellTemplate.setProjectId(projectId);
                     periodCellTemplateList.add(periodCellTemplate);
                     //logger.debug("celltemplate copy end,used time: " + (System.currentTimeMillis() - startTime) + " ms");
@@ -331,7 +332,7 @@ public class ReportServiceImpl {
                     periodCellTemplateConfig.setCellTemplateId(cellTemplateConfig.getCellTemplateId());
                     periodCellTemplateConfig.setReportTemplateId(cellTemplateConfig.getReportTemplateId());
                     periodCellTemplateConfig.setDataSourceType(cellTemplateConfig.getDataSourceType());
-                    periodCellTemplateConfig.setFormula(cellTemplateConfig.getFormula());
+                    periodCellTemplateConfig.setFormula(Utils.isEmpty(cellTemplateConfig.getFormula()) ? null : cellTemplateConfig.getFormula());
                     periodCellTemplateConfig.setParsedFormula(null);
                     periodCellTemplateConfig.setFormulaDescription(cellTemplateConfig.getFormulaDescription());
                     periodCellTemplateConfig.setAccountCodes(cellTemplateConfig.getAccountCodes());
@@ -339,9 +340,9 @@ public class ReportServiceImpl {
                     periodCellTemplateConfig.setTaxRate(cellTemplateConfig.getTaxRate());
                     periodCellTemplateConfig.setInvoiceAmountType(cellTemplateConfig.getInvoiceAmountType());
                     periodCellTemplateConfig.setModelIds(cellTemplateConfig.getModelIds());
-                    periodCellTemplateConfig.setCreateBy(cellTemplateConfig.getCreateBy());
+                    periodCellTemplateConfig.setCreateBy(Utils.isEmpty(cellTemplateConfig.getCreateBy()) ? "admin" : cellTemplateConfig.getCreateBy());
                     periodCellTemplateConfig.setCreateTime(cellTemplateConfig.getCreateTime());
-                    periodCellTemplateConfig.setUpdateBy(cellTemplateConfig.getUpdateBy());
+                    periodCellTemplateConfig.setUpdateBy(Utils.isEmpty(cellTemplateConfig.getUpdateBy()) ? "admin" : cellTemplateConfig.getUpdateBy());
                     periodCellTemplateConfig.setUpdateTime(cellTemplateConfig.getUpdateTime());
                     periodCellTemplateConfig.setInvoiceCategory(cellTemplateConfig.getInvoiceCategory());
                     periodCellTemplateConfig.setFormulaDataSource(cellTemplateConfig.getFormulaDataSource());

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TemplateExtendsMapper.xml

@@ -53,13 +53,12 @@
         P.ORDER_INDEX
     </select>
 
-    <resultMap id="TemplateAndGroupDbDto" type="pwc.taxtech.atms.dto.TemplateAndGroupDbDto">
+    <resultMap id="TemplateAndGroupDbDto" type="pwc.taxtech.atms.dpo.TemplateAndGroupDbDto">
         <id column="ID" jdbcType="VARCHAR" property="templateId"/>
         <result column="TEMPLATE_GROUP_ID" jdbcType="VARCHAR" property="templateGroupId"/>
         <result column="TEMPLATE_CODE" jdbcType="VARCHAR" property="templateCode"/>
     </resultMap>
-
-    <select id="getTemplateAndGroupByID" parameterType="java.lang.String" resultMap="TemplateAndGroupDbDto">
+    <select id="getTemplateAndGroupById" parameterType="java.lang.String" resultMap="TemplateAndGroupDbDto">
         SELECT
         P.ID AS ID,
         Q.ID AS TEMPLATE_GROUP_ID,

atms-web/src/main/webapp/app/framework/app-approve/app-approve.ctrl.js

@@ -637,7 +637,22 @@
                         showBorders: true,
                         editing: {
                             mode: "form",
-                            allowUpdating: true
+                            allowUpdating: true,
+                            form: {
+                              items:[
+                                {dataField: "projectName",  editorOptions: { disabled: true}},
+                                {dataField: "period",  editorOptions: { disabled: true}},
+                                {dataField: "createBy",  editorOptions: { disabled: true}},
+                                {dataField: "createTime",  editorOptions: { disabled: true}},
+                                {dataField: "status",  editorOptions: { disabled: true}},
+                                {dataField: "result",
+                                  editorType: 'dxRadioGroup',
+                                  label: { text: '审核结果', location: 'left' },
+                                  editorOptions: { dataSource: [{ text: "通过", value: 'agreed' }, { text: "不通过", value: 'disagreed' }],layout: "horizontal"}
+                                },
+                                {dataField: "approvalResult", editorType: "dxTextArea",editorOptions: {height: 50}}
+                              ]
+                            }
                         },
                          columns:  [
                           { caption: '项目名称', width: '12%', dataField: "projectName"},