Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

bug 19825

See merge request root/atms!179

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.dao.TemplateMapper">
 
-    <resultMap id="TemplateUniqDto" type="pwc.taxtech.atms.dto.TemplateUniqDto">
+    <resultMap id="TemplateUniqDto" type="pwc.taxtech.atms.dpo.TemplateUniqDto">
         <id column="ID" jdbcType="INTEGER" property="id"/>
         <result column="CODE" jdbcType="VARCHAR" property="code"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>

atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.ctrl.js

@@ -73,7 +73,7 @@ controller('editTemplateModalController', ['$scope', '$log', '$translate', '$loc
                 Upload.upload({
                     url: thisConstant.uploadUrl,
                     data: {
-
+                        allowManual: $('#allowManual').is(':checked'),
                         filename: $scope.editModel.file.name,
                         tempFileName: tempFileName,
                     },
@@ -264,6 +264,7 @@ controller('editTemplateModalController', ['$scope', '$log', '$translate', '$loc
                     data: {
                         templateGroupID: $scope.editModel.templateGroupID,
                         sheetList: json,
+                        allowManual: $("#allowManual").is(":checked"),
                         filename: $scope.editModel.file.name,
                         tempFileName: tempFileName,
                         reportType: $scope.editModel.reportType

atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.html

@@ -31,7 +31,14 @@
                     </div>
                 </div>
 
+                <div class="form-group radio-wrapper" ng-show="!editModel.addExists">
+                    <label for="telCode" class="col-sm-4 normal-label">
+                        <input type="radio" id="allowManual"><span>允许手工录入</span>
+                    </label>
+                </div>
+
                 <div class="form-group" ng-show="editModel.addExists">
+
                     <label for="telCode" class="col-sm-3 control-label">选择报表：</label>
                     <div class="col-sm-9">
                         <div id={{::editModel.findSheetDxDropID}}></div>

atms-web/src/main/webapp/app/common/controls/edit-templategroup-modal/edit-templategroup-modal.html

@@ -28,9 +28,9 @@
                         <div id={{::editModel.sheetSelectDxID}}></div>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label for="telCode" class="col-sm-5 control-label"><input type="radio" id="allowManual"></label>
-                    <label for="telCode" class="col-sm-5 control-label"><span>允许手工录入</span></label>
+                <div class="form-group radio-wrapper">
+                    <label for="telCode" class="col-sm-4 normal-label">
+                        <input type="radio" id="allowManual"><span>允许手工录入</span></label>
                 </div>
             </form>
         </div>