.gitignore

@@ -12,9 +12,3 @@
 /build.gradle
 /gradle/
 /secondev-chapanda-attend/build
-/secondev-chapanda-workflow/build
-
-/buildSrc/
-
-/secDevClasses/
-/secDevLib/

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'com.weaver.ecode.gradle.plugin.BuildArchPlugin'
+//    id 'com.weaver.ecode.gradle.plugin.BuildArchPlugin'
 }
 
 group 'com.weaver.seconddev'
@@ -22,7 +22,7 @@ def ignoredProjectNames = []
 configure(allprojects) { project ->
 
     apply plugin: 'java'
-    apply plugin: 'com.weaver.ecode.gradle.plugin.BuildArchPlugin'
+//    apply plugin: 'com.weaver.ecode.gradle.plugin.BuildArchPlugin'
 
     compileJava {
         options.encoding = 'UTF-8'

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/KqMindDoneAction.java

@@ -13,7 +13,6 @@ import com.weaver.mc.api.entity.SendMessageEntity;
 import com.weaver.seconddev.chapanda.constant.Constant;
 import com.weaver.seconddev.chapanda.entity.dto.EmployeeAttendDTO;
 import com.weaver.seconddev.chapanda.feishu.constant.Constants;
-import com.weaver.seconddev.chapanda.feishu.entity.OkHttpDto;
 import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuOpenIdUtil;
 import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuSendTodoUtil;
 import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuTokenUtil;
@@ -127,8 +126,7 @@ public class KqMindDoneAction implements EsbServerlessRpcRemoteInterface {
         taskListArray.add(taskListJson);
         bodyJson.put("task_list", taskListArray);
         log.error("sendToFeiShuTodo-bodyJson:{}", bodyJson.toJSONString());
-        OkHttpDto okHttpDto = esb2FeishuSendTodoUtil.doPostSendMessage(bodyJson.toJSONString(), token);
+        String sendResult = esb2FeishuSendTodoUtil.doPostSendMessage(bodyJson.toJSONString(), token);
-        String sendResult = okHttpDto.getResponseBody();
         if (StringUtils.isNotBlank(sendResult)) {
             JSONObject returnData = JSONObject.parseObject(sendResult);
             if (returnData.containsKey("code")) {

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/SendKqMindAction.java

@@ -13,7 +13,6 @@ import com.weaver.mc.api.entity.SendMessageEntity;
 import com.weaver.seconddev.chapanda.constant.Constant;
 import com.weaver.seconddev.chapanda.entity.dto.EmployeeAttendDTO;
 import com.weaver.seconddev.chapanda.feishu.constant.Constants;
-import com.weaver.seconddev.chapanda.feishu.entity.OkHttpDto;
 import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuBotCreateTodoUtil;
 import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuOpenIdUtil;
 import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuSendTodoUtil;
@@ -200,8 +199,7 @@ public class SendKqMindAction implements EsbServerlessRpcRemoteInterface {
         taskListArray.add(taskListJson);
         bodyJson.put("task_list", taskListArray);
         log.error("sendToFeiShuTodo-bodyJson:{}", bodyJson.toJSONString());
-        OkHttpDto okHttpDto = esb2FeishuSendTodoUtil.doPostSendMessage(bodyJson.toJSONString(), token);
+        String sendResult = esb2FeishuSendTodoUtil.doPostSendMessage(bodyJson.toJSONString(), token);
-        String sendResult = okHttpDto.getResponseBody();
         if (StringUtils.isNotBlank(sendResult)) {
             JSONObject returnData = JSONObject.parseObject(sendResult);
             if (returnData.containsKey("code")) {

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/annotation/FormItem.java

@@ -51,8 +51,4 @@ public @interface FormItem {
     int precision() default 5;
 
     boolean needNumberSetting() default false;
-
-    boolean browserShowCheckStrictly() default true;
-
-    String datepickerType() default "day";
 }

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/AttendSyncFormController.java

@@ -1,27 +0,0 @@
-package com.weaver.seconddev.chapanda.controller;
-
-import com.weaver.common.authority.annotation.WeaPermission;
-import com.weaver.common.base.entity.result.WeaResult;
-import com.weaver.common.component.form.WeaForm;
-import com.weaver.seconddev.chapanda.service.AttendSyncFormService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/secondev/chapanda/attendSync")
-@WeaPermission(publicPermission = true)
-public class AttendSyncFormController {
-
-    @Autowired
-    private AttendSyncFormService attendSyncFormService;
-
-    @GetMapping("/getForm")
-    @ApiOperation("获取表单")
-    public WeaResult<WeaForm> getFrom() {
-        return WeaResult.success(attendSyncFormService.getForm());
-    }
-
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/OrganizationChangeController.java

@@ -1,30 +0,0 @@
-package com.weaver.seconddev.chapanda.controller;
-
-import com.weaver.common.authority.annotation.WeaPermission;
-import com.weaver.common.base.entity.result.WeaResult;
-import com.weaver.seconddev.chapanda.entity.po.OrganizationChange;
-import com.weaver.seconddev.chapanda.service.OrganizationChangeService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/secondev/organization/change")
-@WeaPermission(publicPermission = true)
-public class OrganizationChangeController {
-
-    @Autowired
-    private OrganizationChangeService organizationChangeService;
-
-    @GetMapping("/selectChangeList")
-    @ApiOperation("获取组织变更信息")
-    public WeaResult<List<OrganizationChange>> selectChangeList(@RequestParam(required = true) String changeDate,
-                                                                @RequestParam(required = true) Long departmentId) {
-        return WeaResult.success(organizationChangeService.selectChangeList(changeDate,departmentId));
-    }
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/dto/AttendSyncFormDTO.java

@@ -1,48 +0,0 @@
-package com.weaver.seconddev.chapanda.entity.dto;
-
-import com.weaver.common.component.form.item.WeaFormItemType;
-import com.weaver.seconddev.chapanda.annotation.Form;
-import com.weaver.seconddev.chapanda.annotation.FormItem;
-import com.weaver.seconddev.chapanda.annotation.TableColumn;
-import com.weaver.seconddev.chapanda.common.BaseDTO;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class AttendSyncFormDTO {
-
-    @Form(
-            label = "考勤周期",
-            labelId = 0,
-            items = {
-                    @FormItem(itemType = WeaFormItemType.DATEPICKER, required = true,datepickerType = "month")
-            },
-            group = "baseInfo"
-    )
-    private String attendMonth;
-
-    @Form(
-            label = "人员",
-            labelId = 0,
-            items = {
-                    @FormItem(browserModule = "attend/web",itemType = WeaFormItemType.BROWSER, browserType = "resource", required = true, browserMultiple = true)
-            }
-    )
-    private BaseDTO resource;
-
-
-    @Form(
-            label = "部门范围",
-            labelId = 0,
-            items = {
-                    @FormItem(browserModule = "attend/web", itemType = WeaFormItemType.BROWSER, browserType = "department", required = true, browserMultiple = true)
-            }
-    )
-    private BaseDTO deptScope;
-
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/EbBaseField.java

@@ -1,127 +0,0 @@
-package com.weaver.seconddev.chapanda.entity.po;
-
-import java.util.Date;
-
-
-public class EbBaseField {
-
-    private Long id;
-
-    private Long formDataId;
-
-    private Integer dataIndex;
-
-    private Integer isFlow;
-
-    private Integer dataStatus;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private String tenantKey;
-
-    private Long creator;
-
-    private Long updater;
-
-    private Integer deleteType;
-
-    private Integer ftStatus;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getFormDataId() {
-        return formDataId;
-    }
-
-    public void setFormDataId(Long formDataId) {
-        this.formDataId = formDataId;
-    }
-
-    public Integer getDataIndex() {
-        return dataIndex;
-    }
-
-    public void setDataIndex(Integer dataIndex) {
-        this.dataIndex = dataIndex;
-    }
-
-    public Integer getIsFlow() {
-        return isFlow;
-    }
-
-    public void setIsFlow(Integer isFlow) {
-        this.isFlow = isFlow;
-    }
-
-    public Integer getDataStatus() {
-        return dataStatus;
-    }
-
-    public void setDataStatus(Integer dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getTenantKey() {
-        return tenantKey;
-    }
-
-    public void setTenantKey(String tenantKey) {
-        this.tenantKey = tenantKey;
-    }
-
-    public Long getCreator() {
-        return creator;
-    }
-
-    public void setCreator(Long creator) {
-        this.creator = creator;
-    }
-
-    public Long getUpdater() {
-        return updater;
-    }
-
-    public void setUpdater(Long updater) {
-        this.updater = updater;
-    }
-
-    public Integer getDeleteType() {
-        return deleteType;
-    }
-
-    public void setDeleteType(Integer deleteType) {
-        this.deleteType = deleteType;
-    }
-
-    public Integer getFtStatus() {
-        return ftStatus;
-    }
-
-    public void setFtStatus(Integer ftStatus) {
-        this.ftStatus = ftStatus;
-    }
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/OrganizationChange.java

@@ -1,50 +0,0 @@
-package com.weaver.seconddev.chapanda.entity.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
-
-@TableName("uf_zzbgjl")
-public class OrganizationChange extends EbBaseField {
-
-    private String departmentCode;
-
-    private Integer operateType;
-
-    private String changeReason;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date changeDate;
-
-    public String getDepartmentCode() {
-        return departmentCode;
-    }
-
-    public void setDepartmentCode(String departmentCode) {
-        this.departmentCode = departmentCode;
-    }
-
-    public Integer getOperateType() {
-        return operateType;
-    }
-
-    public void setOperateType(Integer operateType) {
-        this.operateType = operateType;
-    }
-
-    public String getChangeReason() {
-        return changeReason;
-    }
-
-    public void setChangeReason(String changeReason) {
-        this.changeReason = changeReason;
-    }
-
-    public Date getChangeDate() {
-        return changeDate;
-    }
-
-    public void setChangeDate(Date changeDate) {
-        this.changeDate = changeDate;
-    }
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/mapper/OrganizationChangeMapper.java

@@ -1,17 +0,0 @@
-package com.weaver.seconddev.chapanda.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.weaver.seconddev.chapanda.entity.po.OrganizationChange;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface OrganizationChangeMapper extends BaseMapper<OrganizationChange> {
-
-    List<OrganizationChange> selectChangeList(@Param("tenantKey")String tenantKey,@Param("departmentCode") String departmentCode,
-                                              @Param("changeDate") String changeDate,@Param("dbName") String dbName);
-
-
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/AttendSyncFormService.java

@@ -1,15 +0,0 @@
-package com.weaver.seconddev.chapanda.service;
-
-import com.weaver.common.component.form.WeaForm;
-import com.weaver.common.component.search.WeaSearchCondition;
-import com.weaver.common.component.table.WeaTable;
-import com.weaver.common.component.table.page.Page;
-import com.weaver.seconddev.chapanda.entity.dto.DemoListDTO;
-import com.weaver.seconddev.chapanda.entity.dto.OrderTypeListDTO;
-import com.weaver.seconddev.chapanda.entity.param.DemoQueryParam;
-import com.weaver.seconddev.chapanda.entity.param.OrderTypeQueryParam;
-
-public interface AttendSyncFormService {
-
-    WeaForm getForm();
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/OrganizationChangeService.java

@@ -1,9 +0,0 @@
-package com.weaver.seconddev.chapanda.service;
-
-import com.weaver.seconddev.chapanda.entity.po.OrganizationChange;
-
-import java.util.List;
-
-public interface OrganizationChangeService {
-    List<OrganizationChange> selectChangeList(String changeDate, Long departmentId);
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/impl/AttendSyncFormServiceImpl.java

@@ -1,17 +0,0 @@
-package com.weaver.seconddev.chapanda.service.impl;
-
-import com.weaver.common.component.form.WeaForm;
-import com.weaver.seconddev.chapanda.entity.dto.AttendSyncFormDTO;
-import com.weaver.seconddev.chapanda.service.AttendSyncFormService;
-import com.weaver.seconddev.chapanda.util.FormatUtil;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AttendSyncFormServiceImpl implements AttendSyncFormService {
-
-    @Override
-    public WeaForm getForm() {
-        AttendSyncFormDTO attendSyncFormDTO = new AttendSyncFormDTO();
-        return FormatUtil.<AttendSyncFormDTO>getInstance().buildForm(AttendSyncFormDTO.class, attendSyncFormDTO);
-    }
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/impl/OrganizationChangeServiceImpl.java

@@ -1,39 +0,0 @@
-package com.weaver.seconddev.chapanda.service.impl;
-
-import com.weaver.common.cache.tablecache.impl.ComInfoCache;
-import com.weaver.common.hrm.cache.HrmDepartmentComInfo;
-import com.weaver.seconddev.chapanda.entity.po.OrganizationChange;
-import com.weaver.seconddev.chapanda.mapper.OrganizationChangeMapper;
-import com.weaver.seconddev.chapanda.service.OrganizationChangeService;
-import com.weaver.teams.domain.user.SimpleEmployee;
-import com.weaver.teams.security.context.UserContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class OrganizationChangeServiceImpl implements OrganizationChangeService {
-
-    @Autowired
-    private OrganizationChangeMapper organizationChangeMapper;
-
-    @Autowired
-    ComInfoCache comInfoCache;
-
-    @Value("${attend.chaPanda.ebuider.dbName:e10_common}")
-    private String dbName;
-
-    @Override
-    public List<OrganizationChange> selectChangeList(String changeDate, Long departmentId) {
-        HrmDepartmentComInfo departmentComInfo = (HrmDepartmentComInfo)this.comInfoCache.getCacheById(HrmDepartmentComInfo.class, departmentId);
-        String departmentCode = "";
-        if (departmentComInfo != null) {
-            departmentCode = departmentComInfo.getCode();
-        }
-        SimpleEmployee simpleEmployee = UserContext.getCurrentUser();
-        String tenantKey = simpleEmployee.getTenantKey();
-        return organizationChangeMapper.selectChangeList(tenantKey,departmentCode,changeDate,dbName);
-    }
-}

secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/util/FormatUtil.java

@@ -258,7 +258,6 @@ public class FormatUtil<T> {
                                 weaBrowserBean.setCompleteParams(ImmutableMap.of("publishStatus", "ALL"));
                                 weaBrowserBean.setRequestHeaderParams(ImmutableMap.of("ebBusinessid", "10000000000000000"));
                             }
-                            weaBrowserBean.setShowCheckStrictly(itemAnnotation.browserShowCheckStrictly());
                             weaFormItem.setBrowserBean(weaBrowserBean);
                             break;
                         case TYPESBROWSER:
@@ -272,11 +271,6 @@ public class FormatUtil<T> {
                             weaFormItem.setShareBrowserBean(shareBrowserBean);
                             weaFormItem.setOtherParams(ImmutableMap.of("showShareDetail", "true"));
                             break;
-                        case DATEPICKER:
-                            Map<String, Object> otherParams = new HashMap<>();
-                            otherParams.put("type",itemAnnotation.datepickerType());
-                            weaFormItem.setOtherParams(otherParams);
-                            break;
                         case LOCALE:
                             String tablefield = "";
                             MultiLanguage languageAnnotation = f.getAnnotation(MultiLanguage.class);

secondev-chapanda-attend/src/main/resources/mapper/com/weaver/seconddev/dao/OrganizationChangeMapper.xml

@@ -1,36 +0,0 @@
-<?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="com.weaver.seconddev.chapanda.mapper.OrganizationChangeMapper">
-
-    <resultMap id="OrganizationChangeMap" type="com.weaver.seconddev.chapanda.entity.po.OrganizationChange">
-        <!-- EbBaseField字段 -->
-        <result column="update_time" property="updateTime"/>
-
-        <!-- OrganizationChange特有字段 -->
-        <result column="bgzzbh" property="departmentCode"/>
-        <result column="czlx" property="operateType"/>
-        <result column="bgly" property="changeReason"/>
-        <result column="bgsxrq" property="changeDate"/>
-    </resultMap>
-
-    <select id="selectChangeList" resultMap="OrganizationChangeMap">
-        SELECT
-        update_time,
-        bgzzbh,
-        czlx,
-        bgly,
-        bgsxrq
-        FROM ${dbName}.uf_zzbgjl
-        WHERE delete_type = 0
-        AND tenant_key = #{tenantKey}
-        <if test="departmentCode != null and departmentCode != ''">
-            AND bgzzbh = #{departmentCode}
-        </if>
-        <if test="changeDate != null and changeDate != ''">
-            AND bgsxrq = #{changeDate}
-        </if>
-        ORDER BY update_time DESC
-    </select>
-
-</mapper>

secondev-chapanda-workflow/secondev-chapanda-workflow.gradle

@@ -1,8 +0,0 @@
-plugins{
-    id 'java'
-}
-description = ""
-
-dependencies {
-  // 子项目私有依赖添加
-}