Merge branch 'master' into dev-ly

pom.xml

@@ -48,6 +48,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.11</version>
         </dependency>
 
         <dependency>

src/main/java/com/baosight/hggp/hg/constant/HGConstant.java

@@ -366,6 +366,8 @@ public class HGConstant {
 		public static final String CHECK_DEFECT = "CHECK_DEFECT";
 		//质检问题处理照片
 		public static final String CHECK_HANDLE = "CHECK_HANDLE";
+		//生产报工
+		public static final String SCBG = "SCBG";
 	}
 
 	/**

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -1105,6 +1105,9 @@ public class HGSCTools {
             checkDeleteDate(ids);
             DaoUtils.update(HGSC008.BATCH_DELETE, new HashMap<String,Object>(){{put("ids",ids);}});
             HGZLTools.THGZL002.deleteByWorkIds(ids);
+            ids.forEach( id -> {
+                HGSCTools.THGSC099.deleteByMatId(id, HGConstant.FileBizType.SCBG);
+            });
         }
 
         private static void checkDeleteDate(List<Long> ids){

src/main/resources/application.properties

@@ -4,7 +4,7 @@ logging.level.com.baosight=info
 spring.security.user.name=admin
 spring.security.user.password=12345
 spring.main.allow-bean-definition-overriding=true
-server.port=8083
+server.port=8081
 spring.mvc.view.suffix=.jsp
 spring.mvc.view.prefix=/**
 
@@ -19,12 +19,12 @@ spring.servlet.multipart.file-size-threshold =0
 componentEname=hggp
 projectName=hggp
 moduleName=ep
-projectEnv=dev
+projectEnv=run
 platSchema=iplat_hggp
-eplatSchema=EPLAT
-lowcodedbSchema=lowcodedb
-lowCodeSchema=LOWCODEDB
-projectSchema=LOWCODEDB
+eplatSchema=EPLAT_HGGP
+lowcodedbSchema=lowcodedb_hggp
+lowCodeSchema=LOWCODEDB_HGGP
+projectSchema=LOWCODEDB_HGGP
 metaSchema=hggp
 hggpSchema=hggp
 
@@ -35,10 +35,10 @@ enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 datasource.type=dbcp
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
 jdbc.username=hggp
 #jdbc.username=root
-jdbc.password=hggp123!@#
+jdbc.password=hggp_Twhxz2024Aly
 #jdbc.password=123456
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00

src/main/resources/quartz.properties

@@ -26,11 +26,11 @@ org.quartz.jobStore.isClustered = true
 #\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\u0635\uFFFD\uFFFD\uFFFD\u03E2
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
 #org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
-org.quartz.dataSource.appDS.user = hggp
+org.quartz.dataSource.appDS.user =hggp
 #org.quartz.dataSource.appDS.user = root
-org.quartz.dataSource.appDS.password =hggp123!@#
+org.quartz.dataSource.appDS.password =hggp_Twhxz2024Aly
 #org.quartz.dataSource.appDS.password =123456
 org.quartz.dataSource.appDS.maxConnections = 30
 

src/main/webapp/HG/SC/HGSC008.js

@@ -10,8 +10,15 @@ $(function () {
             pageSize: 20,
             pageSizes: [10, 20, 50, 70, 100],
         },
-        columns: [
-        ],
+        columns: [{
+            field: "operator",
+            template: function (item) {
+                let template = '';
+                template+='<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                    + 'onclick="showUploadFile(' + item.id + ')" >附件清单</a>';
+                return template;
+            }
+        }],
         loadComplete: function(grid) {
         },
         onSuccess: function (e) {
@@ -33,3 +40,17 @@ $(window).load(function () {
     // 查
     query();
 });
+
+/**
+ * 显示附件清单
+ *
+ * @param id
+ */
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HGSC099?methodName=initLoad&inqu_status-0-bizType=SCBG&inqu_status-0-matId=" + id,
+        title: "<div style='text-align: center;'>附件详情</div>",
+        width: "85%",
+        height: "80%",
+    });
+}
\ No newline at end of file

src/main/webapp/HG/SC/HGSC008.jsp

@@ -29,6 +29,7 @@
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
             <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
             <EF:EFColumn ename="accountCode" cname="账套" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
             <EF:EFColumn ename="companyName" cname="公司名称" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFColumn ename="projName" cname="项目名称" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFColumn ename="workCode" cname="报工单号" width="100" enable="false" readonly="true" align="center"/>