Commit fd82a03b authored by 刘林's avatar 刘林

fix(jg):人员资质到期短信提醒,企业许可资质到期短信提醒

parent 84a8172a
...@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.vo.ElevatorModelVo;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService; import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam; import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel; import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
...@@ -320,4 +319,43 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -320,4 +319,43 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, pageParam)); return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, pageParam));
} }
/**
* 初始化接口,调用一次,企业许可到期提醒
*
* @return 返回调用成功信息
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/initEnterpriseLicenseExpirationOnce", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "初始化接口,调用一次,企业许可到期提醒", notes = "初始化接口,调用一次,企业许可到期提醒")
public ResponseModel<String> initEnterpriseLicenseExpirationOnce() {
idxBizJgRegisterInfoService.initEnterpriseLicenseExpirationOnce();
return ResponseHelper.buildResponse("ok");
}
/**
* 初始化接口,调用一次,人员资质过期提醒
*
* @return 返回调用成功信息
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/initUserExpirationReminderOnce", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "初始化接口,调用一次,人员资质过期提醒", notes = "初始化接口,调用一次,人员资质过期提醒")
public ResponseModel<String> initUserExpirationReminderOnce() {
idxBizJgRegisterInfoService.initUserExpirationReminderOnce();
return ResponseHelper.buildResponse("ok");
}
/**
* 初始化接口,调用一次,检验有效期到期提醒
*
* @return 返回调用成功信息
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/inspectionExpirationReminderOnce", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "初始化接口,调用一次,检验有效期到期提醒", notes = "初始化接口,调用一次,检验有效期到期提醒")
public ResponseModel<String> inspectionExpirationReminderOnce() {
idxBizJgRegisterInfoService.inspectionExpirationReminderOnce();
return ResponseHelper.buildResponse("ok");
}
} }
...@@ -67,4 +67,10 @@ public interface IIdxBizJgRegisterInfoService { ...@@ -67,4 +67,10 @@ public interface IIdxBizJgRegisterInfoService {
List<Map<String, Object>> getVehicleCylinderInfo(String useCode); List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam pageParam); IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
void initUserExpirationReminderOnce();
void inspectionExpirationReminderOnce();
void initEnterpriseLicenseExpirationOnce();
} }
...@@ -94,4 +94,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI ...@@ -94,4 +94,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode); List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode);
List<TzBaseEnterpriseInfoDto> selectExpiringUnits(@Param("operator")String operator);
} }
...@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto; ...@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
...@@ -17,4 +16,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> { ...@@ -17,4 +16,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
Long countUserByPostAndAreaCode(@Param("orgCode") String orgCode, @Param("post") String post, @Param("regionCode") String regionCode); Long countUserByPostAndAreaCode(@Param("orgCode") String orgCode, @Param("post") String post, @Param("regionCode") String regionCode);
List<TzsUserPermissionDto> queryPermissionByUserSeq(@Param("userSeq") Long userSeq, @Param("permissionPost") String permissionPost); List<TzsUserPermissionDto> queryPermissionByUserSeq(@Param("userSeq") Long userSeq, @Param("permissionPost") String permissionPost);
List<TzsUserInfoDto> selectUserPermission(@Param("operator") String operator, @Param("posts") List<String> posts);
} }
...@@ -325,4 +325,14 @@ ...@@ -325,4 +325,14 @@
</foreach> </foreach>
</if> </if>
</select> </select>
<select id="selectExpiringUnits" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
SELECT tbei.*
FROM tz_base_unit_licence tbul
JOIN tz_base_enterprise_info tbei ON tbul.unit_Code = tbei.use_unit_code
WHERE 1 = 1
<if test="operator != null and operator !='' ">
AND tbul.expiry_date ${operator} CURRENT_DATE
</if>
</select>
</mapper> </mapper>
...@@ -71,4 +71,19 @@ ...@@ -71,4 +71,19 @@
user_seq = #{userSeq} user_seq = #{userSeq}
and permission_post like concat(#{permissionPost}, '%') and permission_post like concat(#{permissionPost}, '%')
</select> </select>
<select id="selectUserPermission" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
SELECT tup.expiry_date, tui.phone, tui.rec_user_name
FROM tzs_user_permission tup
JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
WHERE 1 = 1
<if test="operator != null and operator !='' ">
AND tup.expiry_date ${operator} CURRENT_DATE
</if>
AND (
<foreach collection="posts" item="post" separator=" OR ">
tui.new_post LIKE CONCAT('%', #{post}, '%')
</foreach>
)
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment