Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自报待办事项

Browse Source
master
赵嘉伟 3 years ago
parent 16da515860
commit 065091b365
6 changed files with 72 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java
Unescape Escape View File

@ -18,7 +18,7 @@ import java.util.Map;
/**
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
@RestController
@RequestMapping("/Z-SELF-REPORT")
@ -99,6 +99,8 @@ public class SelfReportController {
.or().like(SelfReport::getRemark, frontPage.getGlobalQuery())
.or().like(SelfReport::getCreateUser, frontPage.getGlobalQuery())
.or().like(SelfReport::getModifyUser, frontPage.getGlobalQuery())
.or().like(SelfReport::getNcCodeDesc, frontPage.getGlobalQuery())
.or().like(SelfReport::getReportUserGroup, frontPage.getGlobalQuery())
);
}
result = selfReportService.page(frontPage.getPagePlus(), queryWrapper);

6
quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.foreverwin.mesnac.quality.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.foreverwin.mesnac.quality.model.SelfReport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.quality.model.SelfReport;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -15,10 +15,10 @@ import java.util.List;
* </p>
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
@Repository
public interface SelfReportMapper extends BaseMapper<SelfReport> {
List<SelfReport> selectListByCondition(@Param("ew") QueryWrapper<SelfReport> ew, @Param("locale") String locale,@Param("startTime") LocalDate startTime,@Param("endTime") LocalDate endTime);
List<SelfReport> selectListByCondition(@Param("ew") QueryWrapper<SelfReport> ew, @Param("locale") String locale, @Param("startTime") LocalDate startTime, @Param("endTime") LocalDate endTime);
}

66
quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java
Unescape Escape View File

@ -17,7 +17,7 @@ import java.time.LocalDateTime;
* </p>
*
* @author Philip
* @since 2021-08-16
* @since 2021-08-20
*/
@TableName("Z_SELF_REPORT")
@ -121,6 +121,11 @@ public class SelfReport extends Model<SelfReport> {
*/
@TableField("NC_CODE_DESC")
private String ncCodeDesc;
/**
* 提报用户组
*/
@TableField("REPORT_USER_GROUP")
private String reportUserGroup;
/**
* 开始时间
@ -140,29 +145,7 @@ public class SelfReport extends Model<SelfReport> {
@TableField(exist = false)
private String description;
public LocalDate getStartTime() {
return startTime;
}
public void setStartTime(LocalDate startTime) {
this.startTime = startTime;
}
public LocalDate getEndTime() {
return endTime;
}
public void setEndTime(LocalDate endTime) {
this.endTime = endTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getHandle() {
return handle;
@ -316,7 +299,39 @@ public class SelfReport extends Model<SelfReport> {
this.ncCodeDesc = ncCodeDesc;
}
public static final String HANDLE = "HANDLE";
public String getReportUserGroup() {
return reportUserGroup;
}
public void setReportUserGroup(String reportUserGroup) {
this.reportUserGroup = reportUserGroup;
}
public LocalDate getStartTime() {
return startTime;
}
public void setStartTime(LocalDate startTime) {
this.startTime = startTime;
}
public LocalDate getEndTime() {
return endTime;
}
public void setEndTime(LocalDate endTime) {
this.endTime = endTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
@ -354,6 +369,8 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
public static final String NC_CODE_DESC = "NC_CODE_DESC";
public static final String REPORT_USER_GROUP = "REPORT_USER_GROUP";
@Override
protected Serializable pkVal() {
@ -382,6 +399,7 @@ public static final String NC_CODE_DESC = "NC_CODE_DESC";
", modifyUser = " + modifyUser +
", modifiedDateTime = " + modifiedDateTime +
", ncCodeDesc = " + ncCodeDesc +
", reportUserGroup = " + reportUserGroup +
"}";
}
}

4
quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java
Unescape Escape View File

@ -2,8 +2,8 @@ package com.foreverwin.mesnac.quality.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.SelfReport;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.quality.model.SelfReport;
import com.foreverwin.modular.core.util.FrontPage;
import java.time.LocalDate;
@ -16,7 +16,7 @@ import java.util.Map;
* </p>
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
public interface SelfReportService extends IService<SelfReport> {

7
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java
Unescape Escape View File

@ -36,13 +36,14 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
* 自报代办事项 服务实现类
* </p>
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
@Service
@Transactional(rollbackFor = Exception.class)
@ -60,7 +61,6 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
@Autowired
private NcCodeService ncCodeService;
@Override
public IPage<SelfReport> selectPage(FrontPage<SelfReport> frontPage, SelfReport selfReport) {
QueryWrapper<SelfReport> queryWrapper = new QueryWrapper<>();
@ -175,6 +175,7 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
selfReport.setCreatedDateTime(LocalDateTime.now());
selfReport.setModifyUser(user);
selfReport.setModifiedDateTime(LocalDateTime.now());
selfReport.setReportUserGroup(userGroup);
save(selfReport);
}
}
@ -191,4 +192,6 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
return updateById(selfReport);
}
}

18
quality/src/main/resources/mapper/SelfReportMapper.xml
Unescape Escape View File

@ -23,11 +23,12 @@
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
<result column="NC_CODE_DESC" property="ncCodeDesc" />
<result column="REPORT_USER_GROUP" property="reportUserGroup" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, TASK_NO, WORK_CENTER, SHOP_ORDER, ITEM, OP_STEP, RESRCE, SFC, NC_CODE, NC_QTY, LOCATION, STATE, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, NC_CODE_DESC
HANDLE, SITE, TASK_NO, WORK_CENTER, SHOP_ORDER, ITEM, OP_STEP, RESRCE, SFC, NC_CODE, NC_QTY, LOCATION, STATE, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, NC_CODE_DESC, REPORT_USER_GROUP
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
@ -80,6 +81,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</where>
</select>
@ -109,6 +111,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -146,6 +149,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -183,6 +187,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -220,6 +225,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -257,6 +263,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -294,6 +301,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -327,6 +335,7 @@
<if test="modifyUser!=null">MODIFY_USER,</if>
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
<if test="ncCodeDesc!=null">NC_CODE_DESC,</if>
<if test="reportUserGroup!=null">REPORT_USER_GROUP,</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
#{handle},
@ -348,6 +357,7 @@
<if test="modifyUser!=null">#{modifyUser},</if>
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
<if test="ncCodeDesc!=null">#{ncCodeDesc},</if>
<if test="reportUserGroup!=null">#{reportUserGroup},</if>
</trim>
</insert>
@ -376,6 +386,7 @@
#{modifyUser},
#{modifiedDateTime},
#{ncCodeDesc},
#{reportUserGroup},
</trim>
</insert>
@ -400,6 +411,7 @@
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
<if test="et.ncCodeDesc!=null">NC_CODE_DESC=#{et.ncCodeDesc},</if>
<if test="et.reportUserGroup!=null">REPORT_USER_GROUP=#{et.reportUserGroup},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -424,6 +436,7 @@
MODIFY_USER=#{et.modifyUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
NC_CODE_DESC=#{et.ncCodeDesc},
REPORT_USER_GROUP=#{et.reportUserGroup},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -448,6 +461,7 @@
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
<if test="et.ncCodeDesc!=null">NC_CODE_DESC=#{et.ncCodeDesc},</if>
<if test="et.reportUserGroup!=null">REPORT_USER_GROUP=#{et.reportUserGroup},</if>
</trim>
<where>
<if test="ew!=null">
@ -471,6 +485,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -525,6 +540,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}

Write Preview
Loading…
Cancel
Save