上传一下代码

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://dev.java996.icu/clockin-api
+VUE_APP_API_BASE_URL=http://127.0.0.1:8081/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/ClockInTimeZoneList.vue

@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="是否删除">-->
+<!--              <a-input placeholder="请输入是否删除" v-model="queryParam.delFlag"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="创建时间">-->
+<!--              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间" v-model="queryParam.createTime"></j-date>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <template v-if="toggleSearchStatus">-->
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="修改时间">-->
+<!--                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择修改时间" v-model="queryParam.updateTime"></j-date>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--          </template>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+<!--              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
+<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
+<!--            </span>-->
+<!--          </a-col>-->
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clock_in_time_zone')">导出</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>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <clock-in-time-zone-modal ref="modalForm" @ok="modalFormOk"></clock-in-time-zone-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ClockInTimeZoneModal from './modules/ClockInTimeZoneModal'
+
+  export default {
+    name: 'ClockInTimeZoneList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ClockInTimeZoneModal
+    },
+    data () {
+      return {
+        description: 'clock_in_time_zone管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'国家',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'时区',
+            align:"center",
+            dataIndex: 'timeZone'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/clockIntimezone/clockInTimeZone/list",
+          delete: "/clockIntimezone/clockInTimeZone/delete",
+          deleteBatch: "/clockIntimezone/clockInTimeZone/deleteBatch",
+          exportXlsUrl: "/clockIntimezone/clockInTimeZone/exportXls",
+          importExcelUrl: "clockIntimezone/clockInTimeZone/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'国家',dictCode:''})
+        fieldList.push({type:'string',value:'timeZone',text:'时区',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        fieldList.push({type:'datetime',value:'updateTime',text:'修改时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

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

@@ -11,7 +11,7 @@
           </a-col>
           <a-col :md="6" :sm="12">
             <a-form-item label="员工姓名">
-              <j-search-select-tag dict-code="clockin_auth,name,user_id" placeholder="请输入员工姓名" v-model="queryParam.userId"></j-search-select-tag>
+              <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>
@@ -22,7 +22,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('clockin_log')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('打卡报表')">导出</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>-->
@@ -119,23 +119,23 @@
     },
     data () {
       return {
-        description: 'clockin_log管理页面',
+        description: '打卡管理页面',
         // 表头
         columns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
           {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
+            title:'用户',
             align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'用户编号',
-            align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'照片',
@@ -143,6 +143,11 @@
             dataIndex: 'pic',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'打卡时间',
+            align:"center",
+            dataIndex: 'clockInTime'
+          },
           {
             title:'打卡地址',
             align:"center",

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

@@ -18,6 +18,11 @@
               <a-input v-model="model.address" placeholder="请输入打卡地址"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="timeZone">
+              <j-dict-select-tag type="list" v-model="model.timeZone" dictCode="clock_in_time_zone,name,id,del_flag=0" placeholder="请选择时区" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lon">
               <a-input v-model="model.lon" placeholder="请输入经度"  ></a-input>

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

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <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="name">
+              <a-input v-model="model.name" placeholder="请输入国家"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="timeZone">
+              <a-input v-model="model.timeZone" placeholder="请输入时区"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ClockInTimeZoneForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/clockIntimezone/clockInTimeZone/add",
+          edit: "/clockIntimezone/clockInTimeZone/edit",
+          queryById: "/clockIntimezone/clockInTimeZone/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/xcx/modules/ClockInTimeZoneModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <clock-in-time-zone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clock-in-time-zone-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ClockInTimeZoneForm from './ClockInTimeZoneForm'
+
+  export default {
+    name: 'ClockInTimeZoneModal',
+    components: {
+      ClockInTimeZoneForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

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

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <clock-in-time-zone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clock-in-time-zone-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ClockInTimeZoneForm from './ClockInTimeZoneForm'
+  export default {
+    name: 'ClockInTimeZoneModal',
+    components: {
+      ClockInTimeZoneForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/pom.xml

@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>${commons.version}</version>
+			<version>${commons-io.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
@@ -273,6 +273,26 @@
 			<version>3.1.978</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>${poi-ooxml.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>${poi-ooxml.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
+			<version>5.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml-schemas</artifactId>
+			<version>4.1.2</version>
+		</dependency>
 
     </dependencies>
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils2.java

@@ -95,6 +95,17 @@ public class DateUtils2 {
         return dateTimeFormatter.format(localDateTime);
     }
 
+    /**
+     * 获取当前日期 yyyymmdd
+     * @return
+     */
+    public static String getNowDateString4(String zoneId){
+
+        ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of(zoneId));
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(YYYYMMDD);
+        return dateTimeFormatter.format(zonedDateTime);
+    }
+
     /**
      * 获取当前日期 yyyymmdd
      * @return
@@ -726,4 +737,15 @@ public class DateUtils2 {
         return d;
     }
 
+    /**
+     * 传入时区获取当前时间
+     * @param zoneId
+     * @return
+     */
+    public static String getZonedDateTimeNow(String zoneId){
+        ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of(zoneId));
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(HHMMSS);
+        return dateTimeFormatter.format(zonedDateTime);
+    }
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExcelStyleUtil.java

@@ -0,0 +1,39 @@
+package org.jeecg.common.util;
+
+import org.apache.poi.ss.usermodel.*;
+import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl;
+
+public class ExcelStyleUtil extends ExcelExportStylerDefaultImpl {
+
+    public ExcelStyleUtil(Workbook workbook) {
+        super(workbook);
+    }
+
+    @Override
+    public CellStyle getHeaderStyle(short color) {
+        CellStyle style = workbook.createCellStyle();
+        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font font = workbook.createFont();
+        font.setBold(true);
+        font.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(font);
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        return style;
+    }
+
+    @Override
+    public CellStyle getTitleStyle(short color) {
+        CellStyle style = workbook.createCellStyle();
+        Font font = workbook.createFont();
+        font.setBold(true);
+        font.setFontHeightInPoints((short) 14);
+        font.setColor(IndexedColors.DARK_BLUE.getIndex());
+        style.setFont(font);
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        return style;
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInproject/controller/ClockInProjectController.java

@@ -9,7 +9,10 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.clockInproject.entity.ClockInProject;
@@ -82,6 +85,16 @@ public class ClockInProjectController extends JeecgController<ClockInProject, IC
 	@ApiOperation(value="clock_in_project-添加", notes="clock_in_project-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ClockInProject clockInProject) {
+		if(StringUtils.isNotBlank(clockInProject.getTeamId())){
+			List<ClockInProject> clockInProjects = clockInProjectService.lambdaQuery()
+					.eq(ClockInProject::getDelFlag, 0)
+					.eq(ClockInProject::getTeamId, clockInProject.getTeamId())
+					.list();
+
+			if(clockInProjects!= null && clockInProjects.size()!=0){
+				throw new JeecgBootException("该团队已有绑定项目");
+			}
+		}
 		clockInProjectService.save(clockInProject);
 		return Result.OK("添加成功！");
 	}
@@ -96,6 +109,23 @@ public class ClockInProjectController extends JeecgController<ClockInProject, IC
 	@ApiOperation(value="clock_in_project-编辑", notes="clock_in_project-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ClockInProject clockInProject) {
+		if(StringUtils.isNotBlank(clockInProject.getTeamId())){
+			List<ClockInProject> clockInProjects = clockInProjectService.lambdaQuery()
+					.eq(ClockInProject::getDelFlag, 0)
+					.eq(ClockInProject::getTeamId, clockInProject.getTeamId())
+					.list();
+
+			if(clockInProjects!= null && clockInProjects.size()!=0){
+				for (ClockInProject clockInProject1:clockInProjects){
+					if(StringUtils.equals(clockInProject.getId(),clockInProject1.getId())){
+						break;
+					}else{
+						throw new JeecgBootException("该团队已有绑定项目");
+					}
+				}
+
+			}
+		}
 		clockInProjectService.updateById(clockInProject);
 		return Result.OK("编辑成功!");
 	}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInproject/entity/ClockInProject.java

@@ -75,4 +75,7 @@ public class ClockInProject implements Serializable {
 	private String address;
 	/**打卡地址图片*/
 	private String pic;
+	/**时区*/
+	@Dict(dictTable = "clock_in_time_zone",dicCode = "id",dicText = "name")
+	private String timeZone;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInprojectitem/entity/ClockInProjectItem.java

@@ -73,4 +73,6 @@ public class ClockInProjectItem implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private java.util.Date updateTime;
+	/**类型 0正常 1周末 2加班*/
+	private Integer type;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/controller/ClockInTimeZoneController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.clockIntimezone.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.clockIntimezone.entity.ClockInTimeZone;
+import org.jeecg.modules.clockIntimezone.service.IClockInTimeZoneService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: clock_in_time_zone
+ * @Author: jeecg-boot
+ * @Date:   2024-12-10
+ * @Version: V1.0
+ */
+@Api(tags="clock_in_time_zone")
+@RestController
+@RequestMapping("/clockIntimezone/clockInTimeZone")
+@Slf4j
+public class ClockInTimeZoneController extends JeecgController<ClockInTimeZone, IClockInTimeZoneService> {
+	@Autowired
+	private IClockInTimeZoneService clockInTimeZoneService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param clockInTimeZone
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "clock_in_time_zone-分页列表查询")
+	@ApiOperation(value="clock_in_time_zone-分页列表查询", notes="clock_in_time_zone-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ClockInTimeZone>> queryPageList(ClockInTimeZone clockInTimeZone,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ClockInTimeZone> queryWrapper = QueryGenerator.initQueryWrapper(clockInTimeZone, req.getParameterMap());
+		Page<ClockInTimeZone> page = new Page<ClockInTimeZone>(pageNo, pageSize);
+		IPage<ClockInTimeZone> pageList = clockInTimeZoneService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param clockInTimeZone
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_time_zone-添加")
+	@ApiOperation(value="clock_in_time_zone-添加", notes="clock_in_time_zone-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ClockInTimeZone clockInTimeZone) {
+		clockInTimeZoneService.save(clockInTimeZone);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param clockInTimeZone
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_time_zone-编辑")
+	@ApiOperation(value="clock_in_time_zone-编辑", notes="clock_in_time_zone-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ClockInTimeZone clockInTimeZone) {
+		clockInTimeZoneService.updateById(clockInTimeZone);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_time_zone-通过id删除")
+	@ApiOperation(value="clock_in_time_zone-通过id删除", notes="clock_in_time_zone-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		clockInTimeZoneService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "clock_in_time_zone-批量删除")
+	@ApiOperation(value="clock_in_time_zone-批量删除", notes="clock_in_time_zone-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.clockInTimeZoneService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "clock_in_time_zone-通过id查询")
+	@ApiOperation(value="clock_in_time_zone-通过id查询", notes="clock_in_time_zone-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ClockInTimeZone> queryById(@RequestParam(name="id",required=true) String id) {
+		ClockInTimeZone clockInTimeZone = clockInTimeZoneService.getById(id);
+		if(clockInTimeZone==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(clockInTimeZone);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param clockInTimeZone
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ClockInTimeZone clockInTimeZone) {
+        return super.exportXls(request, clockInTimeZone, ClockInTimeZone.class, "clock_in_time_zone");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ClockInTimeZone.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/entity/ClockInTimeZone.java

@@ -0,0 +1,61 @@
+package org.jeecg.modules.clockIntimezone.entity;
+
+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.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: clock_in_time_zone
+ * @Author: jeecg-boot
+ * @Date:   2024-12-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("clock_in_time_zone")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="clock_in_time_zone对象", description="clock_in_time_zone")
+public class ClockInTimeZone implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**国家*/
+	@Excel(name = "国家", width = 15)
+    @ApiModelProperty(value = "国家")
+    private java.lang.String name;
+	/**时区*/
+	@Excel(name = "时区", width = 15)
+    @ApiModelProperty(value = "时区")
+    private java.lang.String timeZone;
+	/**是否删除*/
+	@Dict(dicCode = "is_delete")
+	@Excel(name = "是否删除", width = 15)
+    @ApiModelProperty(value = "是否删除")
+    private java.lang.Integer delFlag;
+	/**创建时间*/
+	@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;
+	/**修改时间*/
+	@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 updateTime;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/mapper/ClockInTimeZoneMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.clockIntimezone.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.clockIntimezone.entity.ClockInTimeZone;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: clock_in_time_zone
+ * @Author: jeecg-boot
+ * @Date:   2024-12-10
+ * @Version: V1.0
+ */
+public interface ClockInTimeZoneMapper extends BaseMapper<ClockInTimeZone> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/mapper/xml/ClockInTimeZoneMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.clockIntimezone.mapper.ClockInTimeZoneMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/service/IClockInTimeZoneService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.clockIntimezone.service;
+
+import org.jeecg.modules.clockIntimezone.entity.ClockInTimeZone;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: clock_in_time_zone
+ * @Author: jeecg-boot
+ * @Date:   2024-12-10
+ * @Version: V1.0
+ */
+public interface IClockInTimeZoneService extends IService<ClockInTimeZone> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/service/impl/ClockInTimeZoneServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.clockIntimezone.service.impl;
+
+import org.jeecg.modules.clockIntimezone.entity.ClockInTimeZone;
+import org.jeecg.modules.clockIntimezone.mapper.ClockInTimeZoneMapper;
+import org.jeecg.modules.clockIntimezone.service.IClockInTimeZoneService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: clock_in_time_zone
+ * @Author: jeecg-boot
+ * @Date:   2024-12-10
+ * @Version: V1.0
+ */
+@Service
+public class ClockInTimeZoneServiceImpl extends ServiceImpl<ClockInTimeZoneMapper, ClockInTimeZone> implements IClockInTimeZoneService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue/ClockInTimeZoneList.vue

@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="是否删除">-->
+<!--              <a-input placeholder="请输入是否删除" v-model="queryParam.delFlag"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="创建时间">-->
+<!--              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间" v-model="queryParam.createTime"></j-date>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <template v-if="toggleSearchStatus">-->
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="修改时间">-->
+<!--                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择修改时间" v-model="queryParam.updateTime"></j-date>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--          </template>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+<!--              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
+<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
+<!--            </span>-->
+<!--          </a-col>-->
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('clock_in_time_zone')">导出</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>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <clock-in-time-zone-modal ref="modalForm" @ok="modalFormOk"></clock-in-time-zone-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ClockInTimeZoneModal from './modules/ClockInTimeZoneModal'
+
+  export default {
+    name: 'ClockInTimeZoneList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ClockInTimeZoneModal
+    },
+    data () {
+      return {
+        description: 'clock_in_time_zone管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'国家',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'时区',
+            align:"center",
+            dataIndex: 'timeZone'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/clockIntimezone/clockInTimeZone/list",
+          delete: "/clockIntimezone/clockInTimeZone/delete",
+          deleteBatch: "/clockIntimezone/clockInTimeZone/deleteBatch",
+          exportXlsUrl: "/clockIntimezone/clockInTimeZone/exportXls",
+          importExcelUrl: "clockIntimezone/clockInTimeZone/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'国家',dictCode:''})
+        fieldList.push({type:'string',value:'timeZone',text:'时区',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        fieldList.push({type:'datetime',value:'updateTime',text:'修改时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue/modules/ClockInTimeZoneForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <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="name">
+              <a-input v-model="model.name" placeholder="请输入国家"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="timeZone">
+              <a-input v-model="model.timeZone" placeholder="请输入时区"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ClockInTimeZoneForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/clockIntimezone/clockInTimeZone/add",
+          edit: "/clockIntimezone/clockInTimeZone/edit",
+          queryById: "/clockIntimezone/clockInTimeZone/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue/modules/ClockInTimeZoneModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <clock-in-time-zone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clock-in-time-zone-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ClockInTimeZoneForm from './ClockInTimeZoneForm'
+
+  export default {
+    name: 'ClockInTimeZoneModal',
+    components: {
+      ClockInTimeZoneForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue/modules/ClockInTimeZoneModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <clock-in-time-zone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clock-in-time-zone-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ClockInTimeZoneForm from './ClockInTimeZoneForm'
+  export default {
+    name: 'ClockInTimeZoneModal',
+    components: {
+      ClockInTimeZoneForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue3/ClockInTimeZone.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/clockIntimezone/clockInTimeZone/list',
+  save='/clockIntimezone/clockInTimeZone/add',
+  edit='/clockIntimezone/clockInTimeZone/edit',
+  deleteOne = '/clockIntimezone/clockInTimeZone/delete',
+  deleteBatch = '/clockIntimezone/clockInTimeZone/deleteBatch',
+  importExcel = '/clockIntimezone/clockInTimeZone/importExcel',
+  exportXls = '/clockIntimezone/clockInTimeZone/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue3/ClockInTimeZone.data.ts

@@ -0,0 +1,59 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '国家',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '时区',
+    align:"center",
+    dataIndex: 'timeZone'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "是否删除",
+      field: "delFlag",
+      component: 'JDictSelectTag',
+      componentProps:{
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "创建时间",
+      field: "createTime",
+      component: 'DatePicker',
+      componentProps: {
+         showTime:true
+       },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "修改时间",
+      field: "updateTime",
+      component: 'DatePicker',
+      componentProps: {
+         showTime:true
+       },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '国家',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '时区',
+    field: 'timeZone',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue3/ClockInTimeZoneList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ClockInTimeZoneModal @register="registerModal" @success="handleSuccess"></ClockInTimeZoneModal>
+  </div>
+</template>
+
+<script lang="ts" name="clockIntimezone-clockInTimeZone" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ClockInTimeZoneModal from './components/ClockInTimeZoneModal.vue'
+  import {columns, searchFormSchema} from './clockInTimeZone.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './clockInTimeZone.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'clock_in_time_zone',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"clock_in_time_zone",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockIntimezone/vue3/components/ClockInTimeZoneModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../clockInTimeZone.data';
+    import {saveOrUpdate} from '../clockInTimeZone.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -10,13 +10,20 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils2;
+import org.jeecg.common.util.ExcelStyleUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.clockInproject.entity.ClockInProject;
 import org.jeecg.modules.clockInproject.service.IClockInProjectService;
@@ -25,6 +32,7 @@ import org.jeecg.modules.clockinauth.service.IClockinAuthService;
 import org.jeecg.modules.clockinlog.entity.ClockinLog;
 import org.jeecg.modules.clockinlog.mapper.ClockinLogMapper;
 import org.jeecg.modules.clockinlog.ressp.ClockInLogExportResp;
+import org.jeecg.modules.clockinlog.ressp.ClockInLogExportResp2;
 import org.jeecg.modules.clockinlog.ressp.ClockInLogResp;
 import org.jeecg.modules.clockinlog.service.IClockinLogService;
 
@@ -35,12 +43,15 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.clockinteamlog.entity.ClockinTeamLog;
 import org.jeecg.modules.clockinteamlog.service.IClockinTeamLogService;
+import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.view.JeecgMapExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -185,7 +196,7 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 
 	@RequestMapping(value = "/exportXls2")
 	public ModelAndView exportXls3(HttpServletRequest request, ClockinLog clockinLog) {
-		return this.exportXls2(request, ClockInLogExportResp.class, "打卡");
+		return this.exportXls3(request,ClockInLogExportResp2.class, "打卡");
 	}
 
 //	@RequestMapping(value = "/exportXls2")
@@ -193,15 +204,21 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 		 // Step.1 组装查询条件
 		 Map<String, String[]> parameterMap = request.getParameterMap();
 		 String[] clockStartTimes = parameterMap.get("clockStartTime");
+		 String[] userIds = parameterMap.get("userId");
 
 //		 QueryWrapper<ClockinLog> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		 List<ClockinTeamLog> clockinTeamLogs = clockinTeamLogService.lambdaQuery()
-				 .eq(ClockinTeamLog::getDelFlag, 0)
-//				 .eq(ClockinTeamLog::getStatus,1)
-				 .list();
+		 LambdaQueryChainWrapper<ClockinTeamLog> queryChainWrapper = clockinTeamLogService.lambdaQuery()
+				 .eq(ClockinTeamLog::getDelFlag, 0);
 
+//		 List<ClockinTeamLog> clockinTeamLogs = clockinTeamLogService.lambdaQuery()
+//				 .eq(ClockinTeamLog::getDelFlag, 0)
+//				 .list();
 
+		 if(userIds!=null && userIds.length!=0 && StringUtils.isNotBlank(userIds[0])){
+			 queryChainWrapper.eq(ClockinTeamLog::getUserId,userIds[0]);
+		 }
+		 List<ClockinTeamLog> clockinTeamLogs = queryChainWrapper.list();
 
 
 //		 int day = Integer.parseInt(DateUtils2.getNowMonthMaxDay());
@@ -229,6 +246,9 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 					 .eq(ClockInProject::getTeamId, clockinTeamLog.getTeamId())
 					 .one();
 
+			 if(clockInProject == null){
+			 	continue;
+			 }
 			 ClockinAuth clockinAuth = clockinAuthService.lambdaQuery()
 					 .eq(ClockinAuth::getDelFlag, 0)
 					 .eq(ClockinAuth::getUserId, clockinTeamLog.getUserId())
@@ -236,13 +256,20 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 			 if(clockinAuth == null){
 			 	continue;
 			 }
-
+			 List<ClockInLogExportResp2> clockInLogExportResp2s = new ArrayList<>();
+			 ClockInLogExportResp clockInLogExportResp = new ClockInLogExportResp();
+			 clockInLogExportResp.setName(clockinAuth.getName());
+			 clockInLogExportResp.setDate(nowYearMonth);
 			 for (int n= 1;n<=day;n++){
-				 ClockInLogExportResp clockInLogExportResp = new ClockInLogExportResp();
-				 clockInLogExportResp.setName(clockinAuth.getName());
-				 clockInLogExportResp.setDate(nowYearMonth);
-				 clockInLogExportResp.setDay(n+"");
-				yearMonthDay = nowYearMonth+"-"+n;
+				 ClockInLogExportResp2 clockInLogExportResp2 = new ClockInLogExportResp2();
+
+
+				 clockInLogExportResp2.setDay(n+"");
+				 yearMonthDay = nowYearMonth+"-"+n;
+				 if(n < 10){
+					 yearMonthDay = nowYearMonth+"-0"+n;
+				 }
+
 				 List<ClockInLogResp> clockInLogExpeort = clockinLogMapper.getClockInLogExpeort(yearMonthDay, clockInProject.getId(), clockinTeamLog.getUserId());
 				 String clockInTime = "";
 				 for (ClockInLogResp clockInLogResp:clockInLogExpeort) {
@@ -253,10 +280,12 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 					 clockInTime = clockInTime+"\n"+clockInLogResp.getClockStartTime();
 //					 strings.add(clockInLogResp.getClockStartTime());
 				 }
-				 clockInLogExportResp.setClockInTime(clockInTime);
-				 exportList.add(clockInLogExportResp);
-			 }
+				 clockInLogExportResp2.setClockInTime(clockInTime);
+				 clockInLogExportResp2s.add(clockInLogExportResp2);
 
+			 }
+			 clockInLogExportResp.setClockInLogExportResp2s(clockInLogExportResp2s);
+			 exportList.add(clockInLogExportResp);
 		 }
 
 
@@ -276,14 +305,107 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 		 mv.addObject(NormalExcelConstants.CLASS, clazz);
 		 //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
 		 ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+//		 exportParams.setType(ExcelType.XSSF);
 		 exportParams.setImageBasePath(upLoadPath);
+
 		 //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
 		 mv.addObject(NormalExcelConstants.PARAMS,exportParams);
 		 mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
 		 return mv;
 	 }
 
-	 private String getId(ClockinLog item) {
+
+
+	protected ModelAndView exportXls3(HttpServletRequest request, Class<ClockInLogExportResp2> clazz, String title) {
+		// Step.1 组装查询条件
+		Map<String, String[]> parameterMap = request.getParameterMap();
+		String[] clockStartTimes = parameterMap.get("clockStartTime");
+		String[] userIds = parameterMap.get("userId");
+
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		LambdaQueryChainWrapper<ClockinTeamLog> queryChainWrapper = clockinTeamLogService.lambdaQuery()
+				.eq(ClockinTeamLog::getDelFlag, 0);
+
+		if (userIds != null && userIds.length != 0 && StringUtils.isNotBlank(userIds[0])) {
+			queryChainWrapper.eq(ClockinTeamLog::getUserId, userIds[0]);
+		}
+		List<ClockinTeamLog> clockinTeamLogs = queryChainWrapper.list();
+
+		// 确定导出月份
+		String nowYearMonth = DateUtils2.getNowYearMonth();
+		if (clockStartTimes != null && clockStartTimes.length != 0 && StringUtils.isNotBlank(clockStartTimes[0])) {
+			nowYearMonth = clockStartTimes[0];
+		}
+		YearMonth yearMonth = YearMonth.parse(nowYearMonth);
+		int daysInMonth = yearMonth.lengthOfMonth(); // 当前月份的天数
+
+		// Step.2 获取导出数据
+		List<Map<String, Object>> exportList = new ArrayList<>();
+		for (ClockinTeamLog clockinTeamLog : clockinTeamLogs) {
+			ClockInProject clockInProject = clockInProjectService.lambdaQuery()
+					.eq(ClockInProject::getDelFlag, 0)
+					.eq(ClockInProject::getTeamId, clockinTeamLog.getTeamId())
+					.one();
+
+			ClockinAuth clockinAuth = clockinAuthService.lambdaQuery()
+					.eq(ClockinAuth::getDelFlag, 0)
+					.eq(ClockinAuth::getUserId, clockinTeamLog.getUserId())
+					.one();
+			if (clockinAuth == null) {
+				continue;
+			}
+
+			// 初始化记录，包含“姓名”和每日打卡记录
+			Map<String, Object> record = new LinkedHashMap<>();
+			record.put("name", clockinAuth.getName());
+			record.put("date", nowYearMonth);
+
+			for (int day = 1; day <= daysInMonth; day++) {
+				String yearMonthDay = nowYearMonth + "-" + (day < 10 ? "0" + day : day);
+				List<ClockInLogResp> clockInLogs = clockinLogMapper.getClockInLogExpeort(
+						yearMonthDay, clockInProject.getId(), clockinTeamLog.getUserId()
+				);
+
+				// 拼接打卡时间或标记“缺卡”
+				StringBuilder clockInTime = new StringBuilder();
+				for (ClockInLogResp log : clockInLogs) {
+					if (StringUtils.isBlank(log.getTime())) {
+						log.setClockStartTime("缺卡");
+					}
+					if (clockInTime.length() > 0) {
+						clockInTime.append("\n");
+					}
+					clockInTime.append(log.getClockStartTime());
+				}
+				record.put(day + "号", clockInTime.length() > 0 ? clockInTime.toString() : "缺卡");
+			}
+			exportList.add(record);
+		}
+
+		// Step.3 动态表头生成
+		List<String> headers = new ArrayList<>();
+		headers.add("姓名");
+		headers.add("日期");
+		for (int i = 1; i <= daysInMonth; i++) {
+			headers.add(i + "号");
+		}
+
+		// Step.4 AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgMapExcelView());
+		mv.addObject(NormalExcelConstants.FILE_NAME, title);
+//		mv.addObject(NormalExcelConstants.CLASS, clazz);
+		ExportParams exportParams = new ExportParams(
+				title + "报表", "导出人:" + sysUser.getRealname(), title);
+//		exportParams.setExclusions(headers.toArray(new String[0])); // 设置表头排除无用列
+		mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+		mv.addObject(NormalExcelConstants.MAP_LIST, exportList);
+		return mv;
+	}
+
+
+
+
+	private String getId(ClockinLog item) {
 		 try {
 			 return PropertyUtils.getProperty(item, "id").toString();
 		 } catch (Exception e) {
@@ -304,4 +426,5 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
         return super.importExcel(request, response, ClockinLog.class);
     }
 
+
 }

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

@@ -37,6 +37,7 @@ public class ClockinLog implements Serializable {
     @ApiModelProperty(value = "id")
     private java.lang.String id;
 	/**用户编号*/
+	@Dict(dictTable = "clockin_auth",dicCode = "user_id",dicText = "name")
 	@Excel(name = "用户编号", width = 15)
     @ApiModelProperty(value = "用户编号")
     private java.lang.String userId;

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/mapper/ClockinLogMapper.java

@@ -41,7 +41,7 @@ public interface ClockinLogMapper extends BaseMapper<ClockinLog> {
     @Select("SELECT IFNULL(count(1),0) FROM clockin_log WHERE del_flag = 0 AND user_id = #{userId} AND clock_in_time like '%${date}%'")
     Integer getClockInTotal(@Param("userId") String userId,@Param("date") String date);
 
-    @Select("select clock_start_time,(select clock_in_time from clockin_log where project_item_id = a.id and del_flag = 0 and user_id = #{userId} and clock_in_time like '%${date}%') time from clock_in_project_item a where project_id = #{projectId}\n")
+    @Select("select clock_start_time,(select clock_in_time from clockin_log where project_item_id = a.id and del_flag = 0 and user_id = '${userId}' and clock_in_time like '%${date}%') time from clock_in_project_item a where project_id = '${projectId}'\n")
     List<ClockInLogResp> getClockInLogExpeort(@Param("date") String date,@Param("projectId") String projectId,@Param("userId") String userId);
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/ressp/ClockInLogExportResp.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.clockinlog.ressp;
 
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 
 import java.util.List;
 
@@ -17,16 +18,13 @@ import java.util.List;
 public class ClockInLogExportResp {
 
     /**年月*/
-    @Excel(name = "时间", width = 15,height = 30)
+    @Excel(name = "时间", width = 15,height = 30,needMerge = true)
     private String date;
     /**姓名*/
-    @Excel(name = "姓名", width = 15,height = 30)
+    @Excel(name = "姓名", width = 15,height = 30,needMerge = true)
     private String name;
-    /**日期*/
-    @Excel(name = "日期", width = 15,height = 30)
-    private String day;
-    /**打卡时间*/
-    @Excel(name = "打卡时间", width = 15,height = 30)
-    private String clockInTime;
+    @ExcelCollection(name = "打卡详情")
+    private List<ClockInLogExportResp2> clockInLogExportResp2s;
+
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/ressp/ClockInLogExportResp2.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.clockinlog.ressp;
+
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Map;
+
+/**
+ * @author java996.icu
+ * @title: ClockInLogExperResp
+ * @projectName clockin-api
+ * @description: TODO
+ * @date 2024/11/29 11:53
+ * @Version V1.0
+ */
+@Data
+public class ClockInLogExportResp2 {
+
+    /**日期*/
+    @Excel(name = "日期", width = 15,height = 30,needMerge = true)
+    private String day;
+    /**打卡时间*/
+    @Excel(name = "打卡时间", width = 15,height = 30,needMerge = true)
+    private String clockInTime;
+
+}

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

@@ -204,4 +204,6 @@ public class HanHaiMember implements Serializable {
 	private ClockinTeam team;
 	@TableField(exist = false)
 	private ClockinAuth auth;
+	/**是否后台管理员*/
+	private Integer adminFlag;
 }

jeecg-boot-module-system/pom.xml

@@ -74,6 +74,12 @@
             <scope>compile</scope>
         </dependency>
 
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>5.2.3</version>
+		</dependency>
+
     </dependencies>
 
 	<build>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/controller/ClockinController.java

@@ -7,10 +7,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.modules.xcx.clockin.req.*;
 import org.jeecg.modules.xcx.clockin.service.IClockinService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -59,4 +56,24 @@ public class ClockinController {
         return clockinService.clockInTime(clockInTimeReq);
     }
 
+    @ApiOperation("项目列表分页")
+    @GetMapping("/project/list")
+    public Result<?> getProjectListPage(HttpServletRequest request, ProjectListPageReq projectListPageReq){
+        projectListPageReq.setToken(TokenUtils.getTokenByRequest(request));
+        return clockinService.getProjectListPage(projectListPageReq);
+    }
+
+    @ApiOperation("设置项目经纬度")
+    @PostMapping("/project/location")
+    public Result<?> setProjectLocation(SetProjectLocationReq setProjectLocationReq){
+        return clockinService.setProjectLocation(setProjectLocationReq);
+    }
+
+
+    @ApiOperation("项目")
+    @GetMapping("/project/id")
+    public Result<?> getProjectById(@RequestParam("id") String id){
+        return clockinService.getProjectById(id);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/req/ProjectListPageReq.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.xcx.clockin.req;
+
+import lombok.Data;
+
+@Data
+public class ProjectListPageReq {
+
+    private String token;
+    private Integer pageNo;
+    private Integer pageSize;
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/req/SetProjectLocationReq.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xcx.clockin.req;
+
+import lombok.Data;
+
+@Data
+public class SetProjectLocationReq {
+
+    private String id;
+    private String lon;
+    private String lat;
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/service/IClockinService.java

@@ -43,4 +43,25 @@ public interface IClockinService {
      */
     Result<?> clockInTime(ClockInTimeReq clockInTimeReq);
 
+    /**
+     * 获取项目列表分页
+     * @param projectListPageReq
+     * @return
+     */
+    Result<?> getProjectListPage(ProjectListPageReq projectListPageReq);
+
+    /**
+     * 设置项目的经纬度
+     * @param setProjectLocationReq
+     * @return
+     */
+    Result<?> setProjectLocation(SetProjectLocationReq setProjectLocationReq);
+
+    /**
+     * 项目
+     * @param id
+     * @return
+     */
+    Result<?> getProjectById(String id);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/service/impl/ClockinServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.xcx.clockin.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tencentcloudapi.iai.v20180301.models.VerifyFaceResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -12,6 +13,8 @@ import org.jeecg.modules.clockInproject.entity.ClockInProject;
 import org.jeecg.modules.clockInproject.service.IClockInProjectService;
 import org.jeecg.modules.clockInprojectitem.entity.ClockInProjectItem;
 import org.jeecg.modules.clockInprojectitem.service.IClockInProjectItemService;
+import org.jeecg.modules.clockIntimezone.entity.ClockInTimeZone;
+import org.jeecg.modules.clockIntimezone.service.IClockInTimeZoneService;
 import org.jeecg.modules.clockinconf.service.IClockInConfService;
 import org.jeecg.modules.clockinlog.entity.ClockinLog;
 import org.jeecg.modules.clockinlog.ressp.ClockInLogResp;
@@ -28,6 +31,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.*;
 @Slf4j
 @Service
@@ -46,6 +52,8 @@ public class ClockinServiceImpl implements IClockinService {
     private IClockinTeamLogService clockinTeamLogService;
     @Resource
     private IClockInConfService clockInConfService;
+    @Resource
+    private IClockInTimeZoneService clockInTimeZoneService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -77,8 +85,13 @@ public class ClockinServiceImpl implements IClockinService {
             log.info("距离:"+distance);
             throw new JeecgBootException("不在有效打卡距离内");
         }
-        ClockInProjectItem validClockInTime = clockInProjectItemService.getValidClockInTime(DateUtils2.getNowDateTimeStrings(), clockInProject.getId());
+        ClockInTimeZone clockInTimeZone = clockInTimeZoneService.lambdaQuery()
+                .eq(ClockInTimeZone::getId, clockInProject.getTimeZone())
+                .one();
+        String zonedDateTimeNow = DateUtils2.getZonedDateTimeNow(clockInTimeZone.getTimeZone());
+        ClockInProjectItem validClockInTime = clockInProjectItemService.getValidClockInTime(zonedDateTimeNow, clockInProject.getId());
         if(validClockInTime == null){
+            log.info("时间:"+zonedDateTimeNow+"项目id："+clockInProject.getId());
             throw new JeecgBootException("当前未到打卡时间");
         }
 
@@ -87,7 +100,8 @@ public class ClockinServiceImpl implements IClockinService {
         ClockinLog clockinLog1 = clockinLogService.lambdaQuery()
                 .eq(ClockinLog::getDelFlag, 0)
                 .eq(ClockinLog::getProjectItemId, validClockInTime.getId())
-                .like(ClockinLog::getCreateTime, DateUtils2.getNowDateString3())
+                .eq(ClockinLog::getUserId,hanHaiMember.getId())
+                .like(ClockinLog::getCreateTime, DateUtils2.getNowDateString4(clockInTimeZone.getTimeZone()))
                 .one();
         ClockinLog clockinLog = new ClockinLog();
         if(clockinLog1 != null){
@@ -102,7 +116,10 @@ public class ClockinServiceImpl implements IClockinService {
         clockinLog.setProjectId(clockInProject.getId());
         clockinLog.setProjectItemId(validClockInTime.getId());
         clockinLog.setTeamId(clockinTeamLog.getTeamId());
-        clockinLog.setClockInTime(new Date());
+        ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of(clockInTimeZone.getTimeZone()));
+        LocalDateTime localDateTime = zonedDateTime.toLocalDateTime();
+        Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+        clockinLog.setClockInTime(date);
         clockinLogService.saveOrUpdate(clockinLog);
         return Result.OK();
     }
@@ -149,6 +166,7 @@ public class ClockinServiceImpl implements IClockinService {
 
         List<ClockInProjectItem> clockInProjectItemList = clockInProjectItemService.lambdaQuery()
                 .eq(ClockInProjectItem::getDelFlag, 0)
+                .eq(ClockInProjectItem::getType,0)
                 .eq(ClockInProjectItem::getProjectId, clockInProject.getId())
                 .list();
         Date date = new Date();
@@ -236,9 +254,13 @@ public class ClockinServiceImpl implements IClockinService {
         if(clockInProject == null){
             throw new JeecgBootException("当前团队未配置项目");
         }
-
-        ClockInProjectItem validClockInTime = clockInProjectItemService.getValidClockInTime(DateUtils2.getNowDateTimeStrings(), clockInProject.getId());
+        ClockInTimeZone clockInTimeZone = clockInTimeZoneService.lambdaQuery()
+                .eq(ClockInTimeZone::getId, clockInProject.getTimeZone())
+                .one();
+        String zonedDateTimeNow = DateUtils2.getZonedDateTimeNow(clockInTimeZone.getTimeZone());
+        ClockInProjectItem validClockInTime = clockInProjectItemService.getValidClockInTime(zonedDateTimeNow, clockInProject.getId());
         if(validClockInTime == null){
+            log.info("时间:"+zonedDateTimeNow+"项目id："+clockInProject.getId());
             throw new JeecgBootException("当前未到打卡时间");
         }
 
@@ -252,4 +274,56 @@ public class ClockinServiceImpl implements IClockinService {
 
         return Result.OK();
     }
+
+    @Override
+    public Result<?> getProjectListPage(ProjectListPageReq projectListPageReq) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(projectListPageReq.getToken());
+
+        if(hanHaiMember.getAdminFlag() == 0){
+            throw new JeecgBootException("无权访问");
+        }
+
+        Page<ClockInProject> page = new Page<>(projectListPageReq.getPageNo(), projectListPageReq.getPageSize());
+
+        Page<ClockInProject> clockInProjectPage = clockInProjectService.lambdaQuery()
+                .eq(ClockInProject::getDelFlag, 0)
+                .orderByDesc(ClockInProject::getCreateTime)
+                .page(page);
+        return Result.OK(clockInProjectPage);
+    }
+
+    @Override
+    public Result<?> setProjectLocation(SetProjectLocationReq setProjectLocationReq) {
+
+        if(StringUtils.isBlank(setProjectLocationReq.getLon())){
+            throw new JeecgBootException("请上传经度");
+        }
+        if(StringUtils.isBlank(setProjectLocationReq.getLat())){
+            throw new JeecgBootException("请上传纬度");
+        }
+        ClockInProject clockInProject = clockInProjectService.lambdaQuery()
+                .eq(ClockInProject::getDelFlag, 0)
+                .eq(ClockInProject::getId, setProjectLocationReq.getId())
+                .one();
+        if(clockInProject == null){
+            throw new JeecgBootException("数据错误");
+        }
+
+        ClockInProject clockInProject1 = new ClockInProject();
+        clockInProject1.setId(clockInProject.getId());
+        clockInProject1.setLon(setProjectLocationReq.getLon());
+        clockInProject1.setLat(setProjectLocationReq.getLat());
+        clockInProjectService.updateById(clockInProject1);
+
+        return Result.OK();
+    }
+
+    @Override
+    public Result<?> getProjectById(String id) {
+        ClockInProject clockInProject = clockInProjectService.lambdaQuery()
+                .eq(ClockInProject::getDelFlag, 0)
+                .eq(ClockInProject::getId, id)
+                .one();
+        return Result.OK(clockInProject);
+    }
 }

jeecg-boot-module-system/src/test/java/org/jeecg/Test.java

@@ -1,18 +1,44 @@
 package org.jeecg;
 
+import org.apache.commons.io.IOUtils;
 import org.jeecg.common.util.DateUtils2;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 public class Test {
 
     @org.junit.Test
     public void test(){
-        Date date1 = new Date();
-        Date date2 = DateUtils2.getDate("2024-06-01 00:00:00");
-        String yyyymm = DateUtils2.getYYYYMM(date2);
-        String date = DateUtils2.getNowDay2(DateUtils2.currentXDayOfMonth(date2));
-        System.out.println(yyyymm);
+
+        ZonedDateTime utc = ZonedDateTime.now(ZoneId.of("UTC+7"));
+        LocalDateTime localDateTime = utc.toLocalDateTime();
+        Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+        System.out.println(date);
+
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+        System.out.println(dateTimeFormatter.format(utc));
+        ZonedDateTime beijingTime = ZonedDateTime.now(ZoneId.of("Asia/Shanghai"));
+        System.out.println("Beijing Time: " + dateTimeFormatter.format(beijingTime));
+//        Date date1 = new Date();
+//        Date date2 = DateUtils2.getDate("2024-06-01 00:00:00");
+//        String yyyymm = DateUtils2.getYYYYMM(date2);
+//        String date = DateUtils2.getNowDay2(DateUtils2.currentXDayOfMonth(date2));
+//        System.out.println(yyyymm);
+    }
+
+    @org.junit.Test
+    public void test2(){
+        Package pkg = IOUtils.class.getPackage();
+        System.out.println("Commons IO Version: " + pkg.getImplementationVersion());
     }
 
 }

pom.xml

@@ -44,6 +44,7 @@
 		<minidao.version>1.9.0</minidao.version>
 		<druid.version>1.1.22</druid.version>
 		<commons.version>2.6</commons.version>
+		<commons-io.version>2.11.0</commons-io.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.11.2</aliyun.oss.version>
 		<!-- shiro -->
@@ -59,6 +60,7 @@
 		<!-- Log4j2爆雷漏洞 -->
 		<log4j2.version>2.17.0</log4j2.version>
 		<logback.version>1.2.9</logback.version>
+		<poi-ooxml.version>5.2.3</poi-ooxml.version>
 	</properties>
 
 	<modules>
@@ -264,12 +266,12 @@
 				<groupId>commons-fileupload</groupId>
 				<artifactId>commons-fileupload</artifactId>
 				<version>1.4</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>commons-io</artifactId>
-						<groupId>commons-io</groupId>
-					</exclusion>
-				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>${commons-io.version}</version>
 			</dependency>
 
 			<!-- justauth第三方登录  -->
@@ -338,6 +340,27 @@
 				<artifactId>tencentcloud-sdk-java-iai</artifactId>
 				<version>3.1.978</version>
 			</dependency>
+
+			<dependency>
+				<groupId>org.apache.poi</groupId>
+				<artifactId>poi-ooxml</artifactId>
+				<version>${poi-ooxml.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.poi</groupId>
+				<artifactId>poi</artifactId>
+				<version>${poi-ooxml.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlbeans</groupId>
+				<artifactId>xmlbeans</artifactId>
+				<version>5.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.poi</groupId>
+				<artifactId>poi-ooxml-schemas</artifactId>
+				<version>4.1.2</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>