Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractPaymentController.java

@@ -0,0 +1,38 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ContractPayment;
+import com.management.platform.service.ContractPaymentService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-05-26
+ */
+@RestController
+@RequestMapping("/contract-payment")
+public class ContractPaymentController {
+
+    @Resource
+    private ContractPaymentService contractPaymentService;
+
+    @RequestMapping("/getList")
+    public HttpRespMsg getList(Integer contractId) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = contractPaymentService.list(new QueryWrapper<ContractPayment>().eq("contract_id", contractId));
+        return msg;
+    }
+
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -621,7 +621,7 @@ public class WeiXinCorpController {
             String sMsg = wxcpt.DecryptMsg(sReqMsgSig, sReqTimeStamp, sReqNonce, requestBody);
             // TODO: 解析出明文xml标签的内容进行处理
             org.json.JSONObject jsonObject = XML.toJSONObject(sMsg);
-//            log.info("jcommonDevCallbackPost 解密后==son==" + jsonObject.toString());
+            log.info("jcommonDevCallbackPost 解密后==son==" + jsonObject.toString());
             jsonObject = jsonObject.getJSONObject("xml");
             if(jsonObject.has("InfoType")){
                 String infoType = jsonObject.getString("InfoType");
@@ -650,11 +650,12 @@ public class WeiXinCorpController {
                     String corpId = jsonObject.getString("AuthCorpId");
                     org.json.JSONObject authUserJson = jsonObject.getJSONObject("AccountList");
                     String authUserId = authUserJson.getString("UserId");
+                    System.out.println("authUserId="+authUserId);
                     User oneUser = userMapper.selectOne(new QueryWrapper<User>().eq("corpwx_userid", authUserId));
                     if (oneUser == null) {
                         //生成该用户
                         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectById(corpId);
-                        if (wxCorpInfo != null) {
+                        if (wxCorpInfo != null && wxCorpInfo.getAuthMode() == 1) {//成员授权模式下，自动激活需要创建用户
                             Integer companyId = wxCorpInfo.getCompanyId();
                             if (wxCorpInfo.getSaasSyncContact() == 1) {
                                 //先插入表，不然前端用户立马点击进入应用会找不到人，

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ContractPayment.java

@@ -0,0 +1,65 @@
+package com.management.platform.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ContractPayment extends Model<ContractPayment> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("contract_id")
+    private Integer contractId;
+
+    /**
+     * 计划回款日期
+     */
+    @TableField("pay_date")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate payDate;
+
+    /**
+     * 回款金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+    /**
+     * 是否
+     */
+    @TableField("is_payed")
+    private Boolean isPayed;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ContractPaymentMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ContractPayment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-05-26
+ */
+public interface ContractPaymentMapper extends BaseMapper<ContractPayment> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ContractPaymentService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ContractPayment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-05-26
+ */
+public interface ContractPaymentService extends IService<ContractPayment> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractPaymentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ContractPayment;
+import com.management.platform.mapper.ContractPaymentMapper;
+import com.management.platform.service.ContractPaymentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-05-26
+ */
+@Service
+public class ContractPaymentServiceImpl extends ServiceImpl<ContractPaymentMapper, ContractPayment> implements ContractPaymentService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java

@@ -851,6 +851,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
 
     @Override
     public synchronized User generateUserInfo(Integer companyId, String corpwxOpenId) {
+        System.out.println("查找匹配用户：companyId="+companyId+",corpwxOpenId="+corpwxOpenId);
         User find = userMapper.selectOne(new QueryWrapper<User>().eq("company_id", companyId).eq("corpwx_userid", corpwxOpenId));
         if (find == null) {
             SysRole defaultRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", companyId).eq("is_default", 1));

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractPaymentMapper.xml

@@ -0,0 +1,19 @@
+<?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.management.platform.mapper.ContractPaymentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ContractPayment">
+        <id column="id" property="id" />
+        <result column="contract_id" property="contractId" />
+        <result column="pay_date" property="payDate" />
+        <result column="amount" property="amount" />
+        <result column="is_payed" property="isPayed" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, contract_id, pay_date, amount, is_payed
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1080,7 +1080,7 @@
   "synchronizingtheassociation": "正在同步关联，请稍等...",
   "booksecret": "请输入通讯录secret",
   "synchronoussuccesss": "同步完成",
-  "areyousuretosynchronize ": "确认从钉钉同步通讯录吗？（可能需要一定的加载时间，请耐心等待）",
+  "areyousuretosynchronize": "确认从钉钉同步通讯录吗？（可能需要一定的加载时间，请耐心等待）",
   "operationcancelled": "已取消操作",
   "namecannotbeempty": "名称不能为空",
   "deletthisemployee": "确定要删除该员工吗?",