版本修复提交;25/06/05

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/compiler.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="jeecg-boot-base-core" />
+        <module name="jeecg-boot-base-tools" />
+        <module name="han-hai-module-pay" />
+        <module name="jeecg-boot-module-system" />
+        <module name="jeecg-system-cloud-api" />
+        <module name="jeecg-system-local-api" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="han-hai-module-pay" options="-parameters" />
+      <module name="han-hai-parent" options="-parameters" />
+      <module name="jeecg-boot-base" options="-parameters" />
+      <module name="jeecg-boot-base-api" options="-parameters" />
+      <module name="jeecg-boot-base-core" options="-parameters" />
+      <module name="jeecg-boot-base-tools" options="-parameters" />
+      <module name="jeecg-boot-module-system" options="-parameters" />
+      <module name="jeecg-system-cloud-api" options="-parameters" />
+      <module name="jeecg-system-local-api" options="-parameters" />
+    </option>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/han-hai-module-pay/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-base/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>

.idea/jarRepositories.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="jeecg" />
+      <option name="name" value="jeecg Repository" />
+      <option name="url" value="https://maven.jeecg.org/nexus/content/repositories/jeecg" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="aliyun" />
+      <option name="name" value="aliyun Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="aliyun" />
+      <option name="name" value="aliyun Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://127.0.0.1:8081/clockin-api
+VUE_APP_API_BASE_URL=http://localhost:8083/clockin-api/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 VUE_APP_MAP_KEY=WPKBZ-OKICI-ZAIGE-U6TQ4-RPQIV-OXBJO

admin-hanhai-vue/src/views/xcx/ClockinAuthList.vue

@@ -1,12 +1,19 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-<!--    <div class="table-page-search-wrapper">-->
-<!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
-<!--        <a-row :gutter="24">-->
-<!--        </a-row>-->
-<!--      </a-form>-->
-<!--    </div>-->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="12">
+            <a-form-item label="员工姓名">
+              <j-search-select-tag dict="clockin_auth,name,user_id,del_flag=0" placeholder="请输入员工姓名" v-model="queryParam.userId"></j-search-select-tag>
+            </a-form-item>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
@@ -123,9 +130,9 @@
             }
           },
           {
-            title:'用户编号',
+            title:'用户昵称',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'姓名',

admin-hanhai-vue/src/views/xcx/ClockinLogList.vue

@@ -27,7 +27,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls2('打卡报表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls2('Employee Attendance Record')">导出</a-button>
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->

admin-hanhai-vue/src/views/xcx/ClockinTeamLogList.vue

@@ -133,9 +133,9 @@
             }
           },
           {
-            title:'用户编号',
+            title:'用户昵称',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'团队编号',

admin-hanhai-vue/src/views/xcx/modules/ClockinAuthForm.vue

@@ -3,11 +3,18 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">-->
+<!--              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+
           <a-col :span="24">
-            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
+            <a-form-model-item label="用户昵称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
             <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
               <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>

admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogForm.vue

@@ -3,9 +3,14 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">-->
+<!--              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
+            <a-form-model-item label="用户昵称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinauth/entity/ClockinAuth.java

@@ -36,10 +36,11 @@ public class ClockinAuth implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private java.lang.String id;
-	/**用户编号*/
-	@Excel(name = "用户编号", width = 15)
-    @ApiModelProperty(value = "用户编号")
-    private java.lang.String userId;
+	/**用户标识*/
+	@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@ApiModelProperty(value = "用户标识")
+	private java.lang.String userId;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java

@@ -109,6 +109,10 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<ClockinLog> queryWrapper = QueryGenerator.initQueryWrapper(clockinLog, req.getParameterMap());
+		//如果clockStartTime不为空
+		if(clockinLog.getClockStartTime()!=null){
+			queryWrapper.like("clock_in_time",clockinLog.getClockStartTime());
+		}
 		Page<ClockinLog> page = new Page<ClockinLog>(pageNo, pageSize);
 		IPage<ClockinLog> pageList = clockinLogService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -201,7 +205,7 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 
 	@RequestMapping(value = "/exportXls2")
 	public Object exportXls3(HttpServletRequest request, ClockinLog clockinLog) throws IOException {
-		return this.exportXls3(request,ClockInLogExportResp.class, "打卡");
+		return this.exportXls3(request,ClockInLogExportResp.class, "Employee Attendance Record");
 	}
 
 //	@RequestMapping(value = "/exportXls2")
@@ -308,7 +312,7 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 				 for (ClockInLogResp clockInLogResp:clockInLogExpeort) {
 
 					 if(StringUtils.isBlank(clockInLogResp.getTime())){
-					 	clockInLogResp.setClockStartTime("缺卡");
+					 	clockInLogResp.setClockStartTime("--:--:--");
 					 }
 					 clockInTime = clockInTime+"\n"+clockInLogResp.getClockStartTime();
 //					 strings.add(clockInLogResp.getClockStartTime());
@@ -478,7 +482,7 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 			Row headerRow = sheet.createRow(headerRowNum);
 			Cell cell1 = headerRow.createCell(0);
 			cell1.setCellStyle(wrapStyle);
-			cell1.setCellValue("姓名："+clockinAuth.getName()+"     日期："+nowYearMonth);
+			cell1.setCellValue("姓名："+clockinAuth.getName()+"     月份："+nowYearMonth);
 			sheet.addMergedRegion(new CellRangeAddress(headerRowNum,headerRowNum,0,day-1));
 //			Row row1 = sheet.createRow(1);
 //			row1.createCell(0).setCellValue(clockinAuth.getName());
@@ -521,7 +525,7 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 					}
 
 					if(StringUtils.isBlank(clockInLogResp.getTime())){
-						clockInLogResp.setClockStartTime("缺卡");
+						clockInLogResp.setClockStartTime("--:--:--");
 					}
 					clockInTime = clockInTime+"\n"+clockInLogResp.getClockStartTime();
 //					 strings.add(clockInLogResp.getClockStartTime());

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/entity/ClockinLog.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -86,4 +84,7 @@ public class ClockinLog implements Serializable {
 	private Date clockInTime;
     /**类型 0正常 1周末 2加班*/
     private Integer type;
+
+    @TableField (exist = false)
+    private String clockStartTime;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/entity/ClockinTeamLog.java

@@ -36,9 +36,10 @@ public class ClockinTeamLog implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private java.lang.String id;
-	/**用户编号*/
-	@Excel(name = "用户编号", width = 15)
-    @ApiModelProperty(value = "用户编号")
+    /**用户标识*/
+    @Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "用户标识")
     private java.lang.String userId;
 	/**团队编号*/
 	@Excel(name = "团队编号", width = 15, dictTable = "clockin_team", dicText = "name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -42,8 +42,10 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8083
   tomcat:
     max-swallow-size: -1
   error:
@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 100MB
+      max-request-size: 100MB
   mail:
     host: smtp.qq.com
     username:
@@ -134,10 +134,14 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.120.64.83:3306/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://gz-cdb-4486l6qp.sql.tencentcdb.com:28636/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: n+~@kB_Z
+          password: hhlm.168820241016
           driver-class-name: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://43.143.235.33:3306/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+#          username: root
+#          password: em#g*mGZ
+#          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
@@ -146,7 +150,7 @@ spring:
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 10
+    database: 7
     host: 47.120.64.83
     lettuce:
       pool:
@@ -157,6 +161,18 @@ spring:
       shutdown-timeout: 1000ms
     password: 'aq.888888'
     port: 6379
+#  redis:
+#    database: 0
+#    host: 43.143.235.33
+#    lettuce:
+#      pool:
+#        max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
+#        max-idle: 0     #最大等待连接中的数量,设 0 为没有限制
+#        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+#        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+#      shutdown-timeout: 1000ms
+#    password: 'em#g*mGZ'
+#    port: 6379
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
@@ -192,11 +208,11 @@ jeecg :
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
-    accessKey: LTAI5tPfZo39q2r9Sr5mW84u
-    secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r
-    endpoint: oss-cn-guangzhou.aliyuncs.com
-    bucketName: augcl
-    staticDomain: https://img.augcl.com
+    accessKey: LTAI5tA1mo2mRHVwKLLE2V7Y
+    secretKey: PBs2Dx3mTuVSH7ReWkiZGW3Vc9i22I
+    endpoint: oss-cn-beijing.aliyuncs.com
+    bucketName: ptchemicalscc
+    staticDomain: https://image.ptchemicalscc.com
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
@@ -332,8 +348,8 @@ third-app:
 weixin:
   mpAppId: wx69aadfc270684d2e
   mpAppSecret: bdc1855fdeaf7ad88f338e865b65d7ca
-  orderNotifyUrl: https://hotel.java996.icu/hotel/order/notify
-  replaceOrderNotifyUrl: https://hotel.java996.icu/hotel/order/replace/notify
+  orderNotifyUrl: https://admin.ptchemicalscc.com/hotel/order/notify
+  replaceOrderNotifyUrl: https://admin.ptchemicalscc.com/hotel/order/replace/notify
 
 tencent:
   cloud:
@@ -344,4 +360,3 @@ tencent:
       groupName: test
       region: ap-beijing
     endpoint: faceid.tencentcloudapi.com
-

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 100MB
+      max-request-size: 100MB
   mail:
     host: smtp.qq.com
     username:

jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 100MB
+      max-request-size: 100MB
   mail:
     host: smtp.qq.com
     username: