Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
This commit is contained in:
BianLzhaoMin
commit
c03ce8ee88
|
|
@ -1093,6 +1093,8 @@ public class TmTaskServiceImpl implements TmTaskService {
|
|||
|
||||
@Override
|
||||
public int insertSelective(TmTask record) {
|
||||
//2024.06.14统一创建人存userId
|
||||
record.setCreateBy(record.getUserId());
|
||||
return tmTaskMapper.insertSelective(record);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -535,7 +535,7 @@
|
|||
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
|
||||
bpl.lot_id as proId,bpl.lot_name as proName,
|
||||
bui.unit_id as unitId,bui.unit_name as unitName,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,tt.create_by as applyFor,d.`name` as taskName,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,su.user_name as applyFor,d.`name` as taskName,
|
||||
case when d.id = '31' then lai.company_audit_remark
|
||||
when d.id = '32' then lai.dept_audit_remark
|
||||
when d.id = '33' then lai.direct_audit_remark
|
||||
|
|
@ -548,7 +548,7 @@
|
|||
tt.create_time as createTimes, tt.update_time as updateTimes
|
||||
FROM
|
||||
tm_task tt
|
||||
LEFT JOIN sys_user su ON tt.create_by = su.user_name
|
||||
LEFT JOIN sys_user su ON tt.create_by = su.user_id
|
||||
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
|
||||
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
|
||||
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
|
||||
|
|
@ -943,7 +943,7 @@
|
|||
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName,su.user_id as userId,
|
||||
bpl.lot_id as proId,bpl.lot_name as proName,
|
||||
bui.unit_id as unitId,bui.unit_name as unitName,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone, su.user_name as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
|
||||
case when d.id = '31' then lai.company_audit_remark
|
||||
when d.id = '32' then lai.dept_audit_remark
|
||||
when d.id = '33' then lai.direct_audit_remark
|
||||
|
|
@ -956,7 +956,7 @@
|
|||
tt.create_time as createTimes, tt.update_time as updateTimes
|
||||
FROM
|
||||
tm_task tt
|
||||
LEFT JOIN sys_user su ON tt.create_by = su.user_name
|
||||
LEFT JOIN sys_user su ON tt.create_by = su.user_id
|
||||
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
|
||||
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
|
||||
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
|
||||
|
|
|
|||
|
|
@ -175,21 +175,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</delete>
|
||||
|
||||
<select id="selectMaTypeList" parameterType="String" resultMap="MaTypeResult">
|
||||
select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
|
||||
select DISTINCT m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
|
||||
m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
|
||||
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
|
||||
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
|
||||
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
||||
m.remark, m.company_id ,m.type_id id , m.type_name label
|
||||
from ma_type m
|
||||
left join ma_prop_set mps on m.type_id = mps.type_id
|
||||
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
|
||||
left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0'
|
||||
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0'
|
||||
left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
|
||||
left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
|
||||
left join ma_type_keeper mtk on mtf.type_id = mtk.type_id
|
||||
left join sys_user su on mtk.user_id = su.user_id
|
||||
<where>
|
||||
m.status = '0'
|
||||
and m.del_flag = '0'
|
||||
<if test="typeName != null and typeName !=''">
|
||||
AND type_name like concat('%',#{typeName},'%')
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -193,6 +193,8 @@ public class BackApplyController extends BaseController {
|
|||
BackApplyInfo backApplyInfo1 = leaseApplyDetailsList.get(0);
|
||||
// 对领料任务表的对象做数据处理
|
||||
BackApplyInfo backApplyInfo = bean.getBackApplyInfo();
|
||||
//创建人
|
||||
backApplyInfo.setCreateBy(bean.getUserId());
|
||||
/* 创建领料单号*/
|
||||
backApplyInfo.setCode(code);
|
||||
/*设置任务ID*/
|
||||
|
|
|
|||
|
|
@ -251,5 +251,7 @@ public class BackApplyInfo extends BaseEntity {
|
|||
private String time;
|
||||
|
||||
private int viewWeb;
|
||||
|
||||
/** 创建者 */
|
||||
@ApiModelProperty(value = "创建者Id")
|
||||
private String userId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ public class BackApplyServiceImpl implements BackApplyService {
|
|||
return backApplyMapper.getBackApplyList(bean);
|
||||
} else {
|
||||
//个人只能看到自己的申请的退料
|
||||
String username = SecurityUtils.getLoginUser().getUsername();
|
||||
bean.setCreateBy(username);
|
||||
String userId = SecurityUtils.getLoginUser().getUserid().toString();
|
||||
bean.setCreateBy(userId);
|
||||
return backApplyMapper.getBackApplyList(bean);
|
||||
}
|
||||
}
|
||||
|
|
@ -112,6 +112,8 @@ public class BackApplyServiceImpl implements BackApplyService {
|
|||
|
||||
@Override
|
||||
public int insertSelective(BackApplyInfo bean) {
|
||||
//2024.06.14创建人统一修改为用户id
|
||||
bean.setCreateBy(bean.getUserId());
|
||||
return backApplyMapper.insertTask(bean);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -299,7 +299,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
|||
for (int i = 0; i < fileIsList.length; i++) {
|
||||
SysFile sysFile = sysFileMapper.selectSysFileInfoById(Long.valueOf(fileIsList[i]));
|
||||
//对获取的图片地址进行拼接
|
||||
fileUrl.append(","+sysFile.getFileUrl());
|
||||
if (i==fileIsList.length-1){
|
||||
fileUrl.append(sysFile.getFileUrl());
|
||||
}else {
|
||||
fileUrl.append(sysFile.getFileUrl()+",");
|
||||
}
|
||||
}
|
||||
scrapApplyDetails.setFileUrl(fileUrl.toString());
|
||||
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ import org.apache.commons.collections4.CollectionUtils;
|
|||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
|
@ -162,8 +165,14 @@ public class SysSmsServiceImpl implements ISysSmsService {
|
|||
} else {
|
||||
sendCount++;
|
||||
}
|
||||
// 获取当前日期和时间
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
// 获取当天午夜时间
|
||||
LocalDateTime midnight = LocalDateTime.of(now.toLocalDate(), LocalTime.MIDNIGHT).plusDays(1);
|
||||
// 计算当前时间到当天午夜的时间差（秒）
|
||||
long secondsUntilMidnight = now.until(midnight, ChronoUnit.SECONDS);
|
||||
//存储一天手机号发送验证码数据
|
||||
redisService.setCacheObject(key, sendCount, 1L, TimeUnit.DAYS);
|
||||
redisService.setCacheObject(key, sendCount, secondsUntilMidnight, TimeUnit.SECONDS);
|
||||
return success("手机号：" + phone + "，短信验证码发送成功 ！");
|
||||
} catch (Exception e) {
|
||||
return AjaxResult.error("发送失败:" + e.getMessage());
|
||||
|
|
|
|||
|
|
@ -159,14 +159,14 @@
|
|||
width="180"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == 0">未验收</span>
|
||||
<span v-if="scope.row.status == 1">已验收</span>
|
||||
<span v-if="scope.row.status == 2">待通知</span>
|
||||
<span v-if="scope.row.status == 3">验收不通过</span>
|
||||
<span v-if="scope.row.status == 4">已审核</span>
|
||||
<span v-if="scope.row.status == 5">已审核</span>
|
||||
<span v-if="scope.row.status == 6">入库待审核</span>
|
||||
<span v-if="scope.row.status == 7">已审核</span>
|
||||
<span v-if="scope.row.status == 0">未验收</span>
|
||||
<span v-if="scope.row.status == 1">已验收</span>
|
||||
<span v-if="scope.row.status == 2">待通知</span>
|
||||
<span v-if="scope.row.status == 3">验收不通过</span>
|
||||
<span v-if="scope.row.status == 4">已入库</span>
|
||||
<span v-if="scope.row.status == 5">入库驳回</span>
|
||||
<span v-if="scope.row.status == 6">入库待审核</span>
|
||||
<span v-if="scope.row.status == 7">综合服务中心未通过</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
|
|||
Loading…
Reference in New Issue