sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev
姜玉琦 2024-12-26 00:29:25 +08:00
parent e55d2cd939
commit f485b3a24c
18 changed files with 285 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
View File

@ -188,7 +188,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
}
// 目的获取所有需要被跳转的节点 currentIds
// 取其中一个父级任务，因为后续要么存在公共网关，要么就是串行公共线路
UserTask oneUserTask = parentUserTaskList.get(0);

58
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AttendanceJgwTask.java
View File

@ -190,8 +190,8 @@ public class AttendanceJgwTask {
public static void main(String[] args){
String d="sxyzxx2024suc";
System.out.println(Base64.encode(d));
System.out.println(DateTime.now().year());
//System.out.println(Base64.encode(d));
//System.out.println(DateTime.now().year());
String appid="6a6f24fe35b04ee0bcf31cfb46ed1051";
String secret="c3h5enh4MjAyNHN1Yw==";
@ -203,11 +203,11 @@ public class AttendanceJgwTask {
if(token==null || token.length()==0){
return;
}
System.out.println(token);
System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd"));
//System.out.println(token);
//System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd"));
String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone);
String leaderTeamId="b3774a8cd04c418dabf36bffbf276661";
System.out.println(subcontractorId);
//System.out.println(subcontractorId);
//findWorkerByLeader(appid,token,leaderTeamId);
@ -225,9 +225,9 @@ public class AttendanceJgwTask {
String path="/webapi/project/findDirectlyUnderTeam";
String time = System.currentTimeMillis() + "";
String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
System.out.println(url);
//System.out.println(url);
String tokenSign = Md5Utils.hash(url);
System.out.println(tokenSign);
//System.out.println(tokenSign);
Map<String, Object> params = new HashMap<>();
params.put("appId",appId);
params.put("timestamp",time);
@ -240,14 +240,14 @@ public class AttendanceJgwTask {
.post(toFormBody(params))
.build();
String data=AttendanceTask.getResult(request);
System.out.println(data);
//System.out.println(data);
JSONObject j= JSON.parseObject(data);
JSONObject jd=j.getJSONObject("data");
JSONArray arr=jd.getJSONArray("teamList");
if(arr.size()>0){
for(int i=0;i<arr.size();i++){
JSONObject jo=arr.getJSONObject(i);
System.out.println("-->"+jo.getString("teamName"));
//System.out.println("-->"+jo.getString("teamName"));
}
}
@ -257,9 +257,9 @@ public class AttendanceJgwTask {
String path="/webapi/project/queryProject";
String time = System.currentTimeMillis() + "";
String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
System.out.println(url);
//System.out.println(url);
String tokenSign = Md5Utils.hash(url);
System.out.println(tokenSign);
//System.out.println(tokenSign);
Map<String, Object> params = new HashMap<>();
params.put("appId",appId);
params.put("timestamp",time);
@ -271,7 +271,7 @@ public class AttendanceJgwTask {
.post(toFormBody(params))
.build();
String data=AttendanceTask.getResult(request);
System.out.println(data);
//System.out.println(data);
JSONObject j= JSON.parseObject(data);
JSONObject jd=j.getJSONObject("data");
JSONArray arr=jd.getJSONArray("projectList");
@ -295,9 +295,9 @@ public class AttendanceJgwTask {
String path="/webapi/project/querySubcontractorByPhone";
String time = System.currentTimeMillis() + "";
String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
System.out.println(url);
//System.out.println(url);
String tokenSign = Md5Utils.hash(url);
System.out.println(tokenSign);
//System.out.println(tokenSign);
Map<String, Object> params = new HashMap<>();
params.put("appId",appId);
params.put("timestamp",time);
@ -308,7 +308,7 @@ public class AttendanceJgwTask {
.post(toFormBody(params))
.build();
String data=AttendanceTask.getResult(request);
System.out.println(data);
//System.out.println(data);
JSONObject j= JSON.parseObject(data);
JSONObject jd=j.getJSONObject("data");
JSONArray arr=jd.getJSONArray("subcontractorList");
@ -328,9 +328,9 @@ public class AttendanceJgwTask {
String path="/webapi/dictInfo/getJobTypeData";
String time = System.currentTimeMillis() + "";
String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
System.out.println(url);
//System.out.println(url);
String tokenSign = Md5Utils.hash(url);
System.out.println(tokenSign);
//System.out.println(tokenSign);
Map<String, Object> params = new HashMap<>();
params.put("appId",appId);
params.put("timestamp",time);
@ -341,7 +341,7 @@ public class AttendanceJgwTask {
.post(toFormBody(params))
.build();
String data=AttendanceTask.getResult(request);
System.out.println(data);
//System.out.println(data);
JSONObject j= JSON.parseObject(data);
JSONObject jd=j.getJSONObject("data");
JSONArray arr=jd.getJSONArray("jobTypes");
@ -360,9 +360,9 @@ public class AttendanceJgwTask {
String time = System.currentTimeMillis() + "";
//String startId="0";
String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
System.out.println(url);
//System.out.println(url);
String tokenSign = Md5Utils.hash(url);
System.out.println(tokenSign);
//System.out.println(tokenSign);
Map<String, Object> params = new HashMap<>();
params.put("appId",appId);
params.put("timestamp",time);
@ -376,7 +376,7 @@ public class AttendanceJgwTask {
.post(toFormBody(params))
.build();
String data=AttendanceTask.getResult(request);
System.out.println(data);
//System.out.println(data);
JSONObject j= JSON.parseObject(data);
JSONObject joData= j.getJSONObject("data");
String endId= joData.getString("endId");
@ -385,11 +385,11 @@ public class AttendanceJgwTask {
for(int i=0;i<arr.size();i++) {
JSONObject json = arr.getJSONObject(i);
String photo=json.getString("signimg");
System.out.println(json.getString("machineType"));
//System.out.println(json.getString("machineType"));
String photoUrl=getPhoto(appId,token,photo);
QuartzProjectAttendanceData sdata = QuartzProjectAttendanceData.createFromJgw(json);
if(sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")){
System.out.println("--->"+sdata.getRemark());
//System.out.println("--->"+sdata.getRemark());
}
//sdata.setScanPhoto(photoUrl);
}
@ -455,7 +455,7 @@ public class AttendanceJgwTask {
for(int i=0;i<arr.size();i++){
JSONObject json=arr.getJSONObject(i);
if(json.getString("workerid").equals("56141214ea304fcc95a8098d3bafed0d")){
System.out.println("---1--");
//System.out.println("---1--");
}
}
}
@ -485,7 +485,7 @@ public class AttendanceJgwTask {
if(arr.size()>0){
for(int i=0;i<arr.size();i++){
JSONObject json=arr.getJSONObject(i);
System.out.println("-->"+json.getString("teamName"));
//System.out.println("-->"+json.getString("teamName"));
}
}
}
@ -664,7 +664,7 @@ public class AttendanceJgwTask {
Object o=arr2.get(0);
}
}
System.out.println("cnt:"+cnt+","+arr.size());
//System.out.println("cnt:"+cnt+","+arr.size());
findAddWorkerByProject(appId, token, projectId, endId);
}
}
@ -707,7 +707,7 @@ public class AttendanceJgwTask {
Object o=arr2.get(0);
}
}
System.out.println("cnt:"+cnt+","+arr.size());
//System.out.println("cnt:"+cnt+","+arr.size());
//findAddWorkerByProject(appId, token, projectId, endId);
}
}
@ -1149,7 +1149,7 @@ public class AttendanceJgwTask {
.post(toFormBody(params))
.build();
String data=AttendanceTask.getResult(request);
System.out.println(data);
//System.out.println(data);
JSONObject j= JSON.parseObject(data);
JSONObject joData= j.getJSONObject("data");
String endId= joData.getString("endId");
@ -1165,7 +1165,7 @@ public class AttendanceJgwTask {
sdata.setCfgid(it.getId());
sdata.setAppId(appId);
if(sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")){
System.out.println("--->"+sdata.getRemark());
//System.out.println("--->"+sdata.getRemark());
}
sdata.setVendorsCode(it.getVendorsCode());
attendanceDataService.add(sdata);

160
ruoyi-ui/src/views/flow/flowLabourInfo/index.vue
View File

@ -191,12 +191,21 @@
fixed="right"
>
<template slot-scope="scope">
<el-button
v-if="getIsUpdate(scope.row)"
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleUpdate(scope.row)"
v-hasPermi="['flow:flowLabourInfo:edit']"
>修改</el-button
>
<el-button
v-if="getApprove(scope.row)"
size="mini"
type="text"
icon="el-icon-finished"
@click="handleUpdate(scope.row)"
@click="handleApprove(scope.row)"
v-hasPermi="['flow:flowLabourInfo:edit']"
>办理</el-button
>
@ -221,52 +230,74 @@
/>
<!-- 添加或修改劳资投诉对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="880px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="118px">
<el-form-item label="所属项目" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入所属项目" />
<el-select
v-model="form.projectId"
filterable
clearable
placeholder="请选择所属项目"
style="width: 100%"
@change="projectChange"
>
<el-option
v-for="item in projectOptions"
:key="item.id"
:label="item.projectName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目名称" prop="projectName">
<!-- <el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" placeholder="请输入项目名称" />
</el-form-item>
</el-form-item> -->
<el-form-item label="总包单位" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入总包单位" />
<el-select
v-model="form.deptId"
clearable
placeholder="请选择总包单位"
style="width: 100%"
>
<el-option
v-for="item in deptOptions"
:key="item.deptId"
:label="item.deptName"
:value="item.deptId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="总包单位名称" prop="deptName">
<!-- <el-form-item label="总包单位名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入总包单位名称" />
</el-form-item>
<el-form-item label="分包单位" prop="subDeptId">
</el-form-item> -->
<!-- <el-form-item label="分包单位" prop="subDeptId">
<el-input v-model="form.subDeptId" placeholder="请输入分包单位" />
</el-form-item>
</el-form-item> -->
<el-form-item label="分包单位名称" prop="subDeptName">
<el-input v-model="form.subDeptName" placeholder="请输入分包单位名称" />
</el-form-item>
<el-form-item label="劳工名称" prop="laborName">
<el-input v-model="form.laborName" placeholder="请输入劳工名称" />
<el-form-item label="投诉人" prop="laborName">
<el-input v-model="form.laborName" placeholder="请输入投诉人名称" />
</el-form-item>
<el-form-item label="身份证码" prop="laborCardid">
<el-input v-model="form.laborCardid" placeholder="请输入身份证码" />
<el-form-item label="身份证号" prop="laborCardId">
<el-input v-model="form.laborCardId" placeholder="请输入投诉人身份证号" />
</el-form-item>
<el-form-item label="联系电话" prop="laborPhone">
<el-input v-model="form.laborPhone" placeholder="请输入联系电话" />
<el-input v-model="form.laborPhone" placeholder="请输入投诉人联系电话" />
</el-form-item>
<el-form-item label="欠薪人数" prop="laborNumber">
<el-input v-model="form.laborNumber" placeholder="请输入欠薪人数" />
<el-input v-model="form.laborNumber" placeholder="请输入欠薪人数" type="number" max="99999"/>
</el-form-item>
<el-form-item label="欠薪金额" prop="laborAmount">
<el-input v-model="form.laborAmount" placeholder="请输入欠薪金额" />
<el-input v-model="form.laborAmount" placeholder="请输入欠薪金额" type="number" max="999999999"/>
</el-form-item>
<el-form-item label="欠薪原因说明" prop="laborReason">
<el-input v-model="form.laborReason" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.laborReason" type="textarea" rows="5" placeholder="请输入欠薪原因说明" />
</el-form-item>
<el-form-item label="附件凭证" prop="files">
<file-upload v-model="form.files" />
</el-form-item>
<el-form-item label="是否有效" prop="isDel">
<el-input v-model="form.isDel" placeholder="请输入是否有效" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<image-upload v-model="form.files" :limit="9" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -339,7 +370,44 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {},
rules: {
laborName: [
{ required: true, message: "请输入投诉人名称", trigger: "blur" },
{ max: 10, message: "最多输入10字符", trigger: "blur" },
],
laborPhone: [
{ required: true, message: "请输入投诉人手机号码", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
laborCardId: [
{ required: true, message: "请输入投诉人身份证号", trigger: "blur" },
{
pattern: /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/,
message: "请输入正确的身份证号",
trigger: "blur",
},
],
projectId: [{ required: true, message: "请选择所属项目单位", trigger: "blur" }],
deptId: [{ required: true, message: "请选择所属总承包单位", trigger: "blur" }],
subDeptName: [
{ required: true, message: "请输入所属劳务分包单位名称", trigger: "blur" },
{ max: 20, message: "最多输入20字符", trigger: "blur" },
],
laborNumber: [
{ required: true, message: "请输入欠薪人数", trigger: "blur" },
],
laborAmount: [
{ required: true, message: "请输入欠薪金额", trigger: "blur" },
],
laborReason: [
{ required: true, message: "请输入拖欠原因说明", trigger: "blur" },
{ max: 600, message: "最多输入600字符", trigger: "blur" },
],
},
tabs: {
all: "全部投诉（0）",
jxz: "进行中（0）",
@ -352,6 +420,8 @@ export default {
zbsp: false,
jdsp: false,
jtsp: false,
deptOptions:[],
projectOptions:[],
};
},
created() {
@ -375,6 +445,12 @@ export default {
});
},
methods: {
getIsUpdate(row) {
if (row.approveStatus < 30 && this.jtsp) {
return true;
}
return false;
},
getApprove(row) {
if (row.approveStatus == "100") {
return false;
@ -398,6 +474,21 @@ export default {
}
}
},
projectChange(val){
// 根据项目查询总包单位
this.form.deptId=null;
this.initDept(val)
},
initDept(val){
this.$api.publics
.queryUnitList({
projectId: val,
unitType: 2
})
.then((d) => {
this.deptOptions = d.rows;
});
},
/** 查询劳资投诉列表 */
getList() {
this.loading = true;
@ -478,9 +569,22 @@ export default {
this.open = true;
this.title = "添加劳资投诉";
},
/** 审批按钮操作 */
handleApprove(row) {
this.$refs.approveFlowLabourDrawer.show(row);
},
/** 修改按钮操作 */
handleUpdate(row) {
this.$refs.approveFlowLabourDrawer.show(row);
//获取项目列表的接口
this.$api.publics.getProjectList({}).then((response) => {
this.projectOptions = response.rows;
});
this.initDept(row.projectId);
getFlowLabourInfo(row.id).then(res => {
this.form = res.data;
this.open = true;
this.title = "修改劳资投诉";
});
},
/** 详情查看 */
handleDetail(row) {

10
ruoyi-ui/src/views/project/checkDetection/index.vue
View File

@ -58,6 +58,10 @@
<el-input v-model="queryParams.laboratoryName" placeholder="请输入实验室名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="提交时间">
<el-date-picker v-model="daterangeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -423,6 +427,7 @@ export default {
resultopen: false,
// 备注时间范围
daterangeCheckTime: [],
daterangeTime: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -563,6 +568,10 @@ export default {
this.queryParams.params["beginCheckTime"] = this.daterangeCheckTime[0];
this.queryParams.params["endCheckTime"] = this.daterangeCheckTime[1];
}
if (null != this.daterangeTime && "" != this.daterangeTime) {
this.queryParams.params["beginTime"] = this.daterangeTime[0];
this.queryParams.params["endTime"] = this.daterangeTime[1];
}
this.queryCount(this.queryParams);
listCheckDetection(this.queryParams).then((response) => {
this.checkDetectionList = (response.rows || []).map((d) => {
@ -625,6 +634,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangeCheckTime = [];
this.daterangeTime = [];
this.resetForm("queryForm");
this.handleQuery();
},

10
ruoyi-ui/src/views/project/materialSeal/index.vue
View File

@ -55,6 +55,10 @@
<el-input v-model="queryParams.witnessUser" placeholder="请输入监理专员名称/电话" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="提交时间">
<el-date-picker v-model="daterangeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -304,6 +308,7 @@ export default {
open: false,
// 备注时间范围
daterangeSealDate: [],
daterangeTime: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -464,6 +469,10 @@ export default {
this.queryParams.params["beginSealDate"] = this.daterangeSealDate[0];
this.queryParams.params["endSealDate"] = this.daterangeSealDate[1];
}
if (null != this.daterangeTime && "" != this.daterangeTime) {
this.queryParams.params["beginTime"] = this.daterangeTime[0];
this.queryParams.params["endTime"] = this.daterangeTime[1];
}
this.queryCount();
listMaterialSeal(this.queryParams).then((response) => {
this.materialSealList = response.rows;
@ -519,6 +528,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangeSealDate = [];
this.daterangeTime = [];
this.resetForm("queryForm");
this.handleQuery();
},

10
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -61,6 +61,10 @@
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="提交时间">
<el-date-picker v-model="daterangeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -356,6 +360,7 @@ export default {
open: false,
// 备注时间范围
daterangeCheckingDate: [],
daterangeTime: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -483,6 +488,10 @@ export default {
this.queryParams.params["beginCheckingDate"] = this.daterangeCheckingDate[0];
this.queryParams.params["endCheckingDate"] = this.daterangeCheckingDate[1];
}
if (null != this.daterangeTime && "" != this.daterangeTime) {
this.queryParams.params["beginTime"] = this.daterangeTime[0];
this.queryParams.params["endTime"] = this.daterangeTime[1];
}
this.queryCount();
listProjectChecking(this.queryParams).then((response) => {
this.projectCheckingList = response.rows;
@ -544,6 +553,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangeCheckingDate = [];
this.daterangeTime = [];
this.resetForm("queryForm");
this.handleQuery();
},

10
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -60,6 +60,10 @@
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="提交时间">
<el-date-picker v-model="daterangeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -332,6 +336,7 @@ export default {
open: false,
// 备注时间范围
daterangeMeasureTime: [],
daterangeTime: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -472,6 +477,10 @@ export default {
this.queryParams.params["beginMeasureTime"] = this.daterangeMeasureTime[0];
this.queryParams.params["endMeasureTime"] = this.daterangeMeasureTime[1];
}
if (null != this.daterangeTime && "" != this.daterangeTime) {
this.queryParams.params["beginTime"] = this.daterangeTime[0];
this.queryParams.params["endTime"] = this.daterangeTime[1];
}
this.queryCount();
listProjectMeasure(this.queryParams).then((response) => {
this.projectMeasureList = response.rows;
@ -531,6 +540,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangeMeasureTime = [];
this.daterangeTime = [];
this.resetForm("queryForm");
this.handleQuery();
},

15
yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java
View File

@ -6,11 +6,15 @@ import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.yanzhu.jh.flow.domain.FlowLabourAuditNode;
import com.yanzhu.jh.flow.mapper.FlowLabourAuditNodeMapper;
import com.yanzhu.jh.project.domain.SurProject;
import com.yanzhu.jh.project.mapper.SurProjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yanzhu.jh.flow.mapper.FlowLabourInfoMapper;
@ -26,6 +30,12 @@ import com.ruoyi.common.utils.SecurityUtils;
@Service
public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
{
@Autowired
private SysDeptMapper deptMapper;
@Autowired
private SurProjectMapper projectMapper;
@Autowired
private FlowLabourInfoMapper flowLabourInfoMapper;
@ -212,6 +222,11 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
@Override
public int updateFlowLabourInfo(FlowLabourInfo flowLabourInfo)
{
SurProject surProject = projectMapper.selectSurProjectById(flowLabourInfo.getProjectId());
SysDept sysDept = deptMapper.selectDeptById(flowLabourInfo.getDeptId());
flowLabourInfo.setProjectName(surProject.getProjectName());
flowLabourInfo.setDeptName(sysDept.getDeptName());
flowLabourInfo.setUpdateBy(SecurityUtils.getUsername());
flowLabourInfo.setUpdateTime(DateUtils.getNowDate());
return flowLabourInfoMapper.updateFlowLabourInfo(flowLabourInfo);

15
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
View File

@ -123,6 +123,11 @@ public class SurProjectCheckDetection extends BaseEntity
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
/** 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String checkTypeName;
private String createByName;
@ -347,6 +352,16 @@ public class SurProjectCheckDetection extends BaseEntity
this.approveStatus = approveStatus;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

14
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
View File

@ -106,6 +106,10 @@ public class SurProjectChecking extends BaseEntity
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
/** 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String dataTypeLvl1;
@ -357,6 +361,16 @@ public class SurProjectChecking extends BaseEntity
this.dataTypeLvl2Name = dataTypeLvl2Name;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

15
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java
View File

@ -80,6 +80,11 @@ public class SurProjectMaterialSeal extends BaseEntity
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
/** 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 封样状态 */
private String materialResult;
@ -249,6 +254,16 @@ public class SurProjectMaterialSeal extends BaseEntity
this.witnessUserName = witnessUserName;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

15
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java
View File

@ -88,6 +88,11 @@ public class SurProjectMeasure extends BaseEntity
@Excel(name = "审核状态",dictType = "project_check_status")
private String approveStatus;
/** 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String measureTypeName;
private String measureInfoName;
private String createByName;
@ -303,6 +308,16 @@ public class SurProjectMeasure extends BaseEntity
this.approveStatus = approveStatus;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

8
yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java
View File

@ -43,8 +43,10 @@ public class AIBoxController extends BaseController {
{
try{
List<Map<String,Object>> list = (List<Map<String,Object>>)dataMap.get("BehaviorResults");
DevAiProjectDataVO devAiProjectDataVO = JSON.parseObject(JSONObject.toJSONString(list.get(0)), DevAiProjectDataVO.class);
devAiProjectDataService.insertHttpDevAiProjectData(devAiProjectDataVO);
if(list!=null && list.size()>0){
DevAiProjectDataVO devAiProjectDataVO = JSON.parseObject(JSONObject.toJSONString(list.get(0)), DevAiProjectDataVO.class);
devAiProjectDataService.insertHttpDevAiProjectData(devAiProjectDataVO);
}
}catch (Exception e){
logger.info("AiBox解析参数失败！！！");
e.printStackTrace();
@ -59,7 +61,7 @@ public class AIBoxController extends BaseController {
public void boWaPush(@RequestBody DevBwAiProjectDataVo data)
{
try{
logger.info("BOWAN...{}");
//logger.info("BOWAN...AiBox...{}",JSON.toJSONString(data));
devAiProjectDataService.insertHttpBwDevAiProjectData(data);
}catch (Exception e){
logger.info("BW...AiBox解析参数失败！！！");

1
yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectDataServiceImpl.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="witnessUserName != null and witnessUserName != ''"> and (spcd.witness_user like concat('%', #{witnessUserName}, '%') or spcd.witness_user_name like concat('%', #{witnessUserName}, '%'))</if>
<if test="laboratoryName != null and laboratoryName != ''"> and spcd.laboratory_name like concat('%', #{laboratoryName}, '%')</if>
<if test="params.beginCheckTime != null and params.beginCheckTime != '' and params.endCheckTime != null and params.endCheckTime != ''"> and spcd.check_time between #{params.beginCheckTime} and #{params.endCheckTime}</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(spcd.create_time) between #{params.beginTime} and #{params.endTime}</if>
<if test="checkState != null and checkState != ''"> and spcd.check_state = #{checkState}</if>
<if test="detectionResult != null and detectionResult != ''"> and spcd.detection_result = #{detectionResult}</if>
<!-- 查询条件-项目部门 -->

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
View File

@ -77,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupDeptUser != null and groupDeptUser != ''"> and spc.group_dept_user like concat('%', #{groupDeptUser}, '%')</if>
<if test="groupDeptUserName != null and groupDeptUserName != ''"> and spc.group_dept_user_name like concat('%', #{groupDeptUserName}, '%')</if>
<if test="params.beginCheckingDate != null and params.beginCheckingDate != '' and params.endCheckingDate != null and params.endCheckingDate != ''"> and spc.checking_date between #{params.beginCheckingDate} and #{params.endCheckingDate}</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(spc.create_time) between #{params.beginTime} and #{params.endTime}</if>
<if test="isDel != null "> and spc.is_del = #{isDel}</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
View File

@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialResult != null and materialResult != ''"> and spme.material_result = #{materialResult}</if>
<if test="approveStatus != null and approveStatus != ''"> and spme.approve_status = #{approveStatus}</if>
<if test="witnessUser != null and witnessUser != ''"> and (spme.witness_user like concat('%', #{witnessUser}, '%') or spme.witness_user_name like concat('%', #{witnessUser}, '%'))</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(spme.create_time) between #{params.beginTime} and #{params.endTime}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
View File

@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qualityUser != null and qualityUser != ''"> and (spm.quality_user like concat('%', #{qualityUser}, '%') or spm.quality_user_name like concat('%', #{qualityUser}, '%'))</if>
<if test="superviseUser != null and superviseUser != ''"> and (spm.supervise_user like concat('%', #{superviseUser}, '%') or spm.supervise_user_name like concat('%', #{superviseUser}, '%'))</if>
<if test="isDel != null and isDel != ''"> and spm.is_del like concat('%', #{isDel}, '%')</if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(spm.create_time) between #{params.beginTime} and #{params.endTime}</if>
<if test="approveStatus != null and approveStatus != ''"> and spm.approve_status = #{approveStatus}</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>