新增任务打卡时间

lidongdong

2023-11-12 96146b66a11b96b59c51ccf69df6c10511e1eeef

新增任务打卡时间

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java

@@ -7,12 +7,14 @@
import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;

@Slf4j
@Api(tags = {"双挣双评新模块-小程序"})
@@ -138,6 +140,17 @@
        return newStriveForFeign.expurgateNeedClaimData(id);
    }


    @ApiOperation(value = "打卡")
    @GetMapping("/needClaimSignIn")
    public R needClaimSignIn(@RequestParam("taskId") String taskId,
                             @RequestParam("userId") String userId,
                             @RequestParam("type") String type)
    {

        return newStriveForFeign.needClaimSignIn(taskId,userId,type);
    }

    /***************************************************************************************************************
     *
     *                 代单位接受

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -88,7 +88,10 @@
    public R expurgateNeedClaimData(@RequestParam("id") String id);



    @GetMapping("/NeedClaim/needClaimSignIn")
    public R needClaimSignIn(@RequestParam("taskId") String taskId,
                             @RequestParam("userId") String userId,
                             @RequestParam("type") String type);


    /***************************************************************************************************************

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java

@@ -51,5 +51,12 @@
    }


    @GetMapping("/needClaimSignIn")
    public R needClaimSignIn(@RequestParam("taskId") String taskId,
                             @RequestParam("userId") String userId,
                             @RequestParam("type") String type)
    {
        return R.ok(claimService.needClaimSignIn(taskId,userId,type));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java

@@ -24,6 +24,10 @@

    NeedProblemClaimDTO getDetails(@Param("id")String id);


    NeedProblemClaimDTO getUserIdDetails(@Param("taskId") String taskId,
                                         @Param("userId") String userId);

    int addData(@Param("item") NeedProblemClaimDTO userIds);

    int editData(@Param("item") NeedProblemClaimDTO userId);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java

@@ -27,4 +27,6 @@
    R expurgateData(String id);

    int getJionNum(String taskId,String userId);

    int needClaimSignIn(String taskId,String userId,String type);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -117,4 +118,28 @@
    {
        return baseMapper.getJionNum(taskId,userId);
    }

    @Override
    public int needClaimSignIn(String taskId, String userId, String type)
    {
        NeedProblemClaimDTO item=new NeedProblemClaimDTO();
        item.setTaskId(taskId);
        item.setUserId(userId);
        if(StringUtils.equals("1",type))
        {
            //开始打卡
            item.setPunchStartTime(new Date());
        }
        else
        {
            NeedProblemClaimDTO userDto=baseMapper.getUserIdDetails(taskId,userId);
            //结束打卡
            Date newDate=new Date();
            item.setPunchEndTime(newDate);

            long times=newDate.getTime()-userDto.getPunchStartTime().getTime();
            item.setServiceTime(times+"");
        }
        return baseMapper.editData(item);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml

@@ -50,6 +50,25 @@
    </select>



    <select id="getUserIdDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO">
        SELECT
        <include refid="Base_Column_List" />
        FROM
        new_fight_need_problem_claim
        <where>
            1=1
            <if test="taskId !=null and taskId != '' ">
                and task_id =#{taskId}
            </if>
            <if test="userId !=null and userId != '' ">
                and user_id =#{userId}
            </if>
        </where>
        LIMIT 1
    </select>


    <insert id="addData">
        insert into new_fight_need_problem_claim
        <trim prefix="(" suffix=")" suffixOverrides=",">