Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -142,7 +142,13 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
             if (null != row) {
                 String cellOne = this.getCellValue(row.getCell(1));
                 String cellTwo = this.getCellValue(row.getCell(2));
-                if (null!=cellTwo  && !"".equals(cellTwo) && !"无".equals(cellTwo)  && !"0".equals(cellTwo)) {
+                if (!"".equals(cellOne) && !"".equals(cellTwo) && !"无".equals(cellTwo)) {
+                    if ("0".equals(cellOne)) {
+                        cellOne = "";
+                    }
+                    if ("0".equals(cellTwo)) {
+                        cellTwo = "";
+                    }
                     donorMaterial.setProjectName(projectName);
                     donorMaterial.setProjectId(projectId);
                     donorMaterial.setMaterialType(cellOne);
@@ -157,9 +163,7 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                     if (null == cellSix || "0".equals(cellSix) || "0.0".equals(cellSix)) {
                         continue;
                     } else {
-                        BigDecimal bigDecimal = new BigDecimal(cellSix);
-                        BigDecimal bigDecimal1 = bigDecimal.setScale(4, BigDecimal.ROUND_HALF_UP);
-                        aDouble = bigDecimal1.doubleValue();
+                        aDouble = getDouble(cellSix);
                     }
                     donorMaterial.setMaterialName(cellThree);
                     donorMaterial.setMaterialDescribe(cellFour);
@@ -290,17 +294,12 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                 String eqmMaterialDetails2 = material.getEqmMaterialDetails2();
                 //通过设备物料描述，项目定义号，查询物料是否存在，存在更新，不存在插入
                 int donor = donorMaterialMapper.findDonor(projectId, eqmMaterialDetails2);
-                //更新
-                BigDecimal bigDecimal = new BigDecimal( material.getMtlNumbers());
-                BigDecimal bigDecimal1 = bigDecimal.setScale(4, BigDecimal.ROUND_HALF_UP);
-                material.setMtlNumbers(bigDecimal1.doubleValue());
                 if (donor <= 0) {
                     //插入
                     material.preInsert();
                     donorMaterialMapper.insertErpOne(material,projectId,projectName);
                 } else {
-
-
+                    //更新
                     donorMaterialMapper.updateErpOne(material, projectId);
                 }
             }
@@ -321,8 +320,8 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                 }
                 BigDecimal erpNum = new BigDecimal(erpNum1);
                 BigDecimal exaNum = new BigDecimal(examinedNum);
-                erpNum.setScale(4, BigDecimal.ROUND_HALF_UP);
-                exaNum.setScale(4, BigDecimal.ROUND_HALF_UP);
+                erpNum.setScale(2, BigDecimal.ROUND_HALF_UP);
+                exaNum.setScale(2, BigDecimal.ROUND_HALF_UP);
                 int i = erpNum.compareTo(exaNum);
                 if (i != 0) {
                     if (null != remarks && !"".equals(remarks)) {

src/main/resources/j2cache/j2cache.properties

@@ -88,7 +88,7 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 127.0.0.1:6379
+redis.hosts = 127.0.0.1:6382
 #redis.hosts = 192.168.2.4:6380
 redis.timeout = 2000
 #192.168.2.4\u73AF\u5883

src/main/resources/properties/jeeplus.properties

@@ -14,20 +14,21 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit_0916?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit_0916?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #\u9547\u6C5F\u73B0\u573A
-#jdbc.url=jdbc:mysql://localhost:3307/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://localhost:3307/sg_audit_0925?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #103\u79C1\u670D\u73AF\u5883
 #jdbc.url=jdbc:mysql://106.12.212.98:3306/sg_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #\u9547\u6C5F\u6D4B\u8BD5\u73AF\u5883
-#jdbc.url=jdbc:mysql://localhost:3306/sg_audit_0811?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://106.12.212.98:3306/sg_audit_0831?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://localhost:3306/sg_audit_0924?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://localhost:3306/sg_audit_changzhou?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://106.12.212.98:3306/sg_audit_0924?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
 #\u9547\u6C5F\u73B0\u573A
 #jdbc.password=Zjsh5182!
 #103\u79C1\u670D\u73AF\u5883\u3001\u9547\u6C5F\u6D4B\u8BD5\u73AF\u5883
-#jdbc.password=Xgxx1234!
-jdbc.password=root
+jdbc.password=Xgxx1234!
+#jdbc.password=root
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
 
@@ -50,7 +51,8 @@ jdbc.pool.maxActive=20
 #============================#
 
 #\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
-productName=\u7532\u4F9B\u7269\u8D44\u9886\u9000\u6599\u4FE1\u606F\u7CFB\u7EDF
+#productName=\u7532\u4F9B\u7269\u8D44\u9886\u9000\u6599\u4FE1\u606F\u7CFB\u7EDF
+productName=\u914D\u7F51\u5168\u8FC7\u7A0B\u7BA1\u7406\u7CFB\u7EDF
 copyrightYear=2017
 version=V3.0
 

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementInformation.jsp

@@ -59,12 +59,12 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:edit">
 				<button id="edit" class="btn btn-primary" onclick="edit()">
-					<i class="glyphicon glyphicon-edit"></i> 专职修改
+					<i class="glyphicon glyphicon-edit"></i> 修改 <!--专职修改-->
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:jlEdit">
 				<button id="jlEdit" class="btn btn-primary" onclick="jlEdit()">
-					<i class="glyphicon glyphicon-edit"></i> 经理修改
+					<i class="glyphicon glyphicon-edit"></i> 修改 <!--经理修改-->
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:del">
@@ -74,12 +74,12 @@
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:import">
 				<button id="btnImport" class="btn btn-info">
-					<i class="fa fa-folder-open-o"></i> 专职导入
+					<i class="fa fa-folder-open-o"></i> 导入  <!--专职导入-->
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:jlImport">
 				<button id="jlImport" class="btn btn-info">
-					<i class="fa fa-folder-open-o"></i> 经理导入
+					<i class="fa fa-folder-open-o"></i> 导入  <!--经理导入-->
 				</button>
 			</shiro:hasPermission>
 			<shiro:hasPermission name="sg:managementcenter:reserveManagement:export">