FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!273
This commit is contained in:
王夏晖
2021-12-07 20:13:41 +08:00
parent 17feda6305 3da2c21cd9
commit 0197e1b17f
19 changed files with 96 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+1 -1
View File
@@ -409,6 +409,6 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET)
List<BusProcessNew> everyDayTenOlockSAM();
@RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.GET)
@RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST)
String delCG(@RequestParam("id") String id);
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+1 -1
View File
@@ -689,7 +689,7 @@ public class WorkFlowController {
}
@ApiOperation(value = "草稿删除")
@GetMapping("/delCG")
@PostMapping("/delCG")
public String delCG(@RequestParam("id")String id){
return workFlowFeignClient.delCG(id);
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class ProcessDetailExport {
private Date startTime;
@Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15)
private Date endTime;
@Excel(name = "审批意见", orderNum = "5",width = 15)
@Excel(name = "流程信息", orderNum = "5",width = 15)
private String comment;
@Excel(name = "状态", orderNum = "6",width = 15)
private String flag;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java
+8
View File
@@ -118,4 +118,12 @@ public class TsUserVO {
@ApiModelProperty(value = "岗位")
@TableField(exist = false)
private List<TsPosition> positions;
@ApiModelProperty(value = "单位")
@TableField(exist = false)
private String unit;
@ApiModelProperty(value = "单位Id")
@TableField(exist = false)
private String unitId;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
+5
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.dao;
import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,8 @@ import java.util.List;
public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
List<SarPublicIdeaAll> getPublicIdea(@Param("unique")String unique);
List<SarPublicIdeaAll> getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId);
Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
+7 -4
View File
@@ -48,10 +48,13 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
} catch (ParseException e) {
e.printStackTrace();
}
QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
wrapper.eq("idea_id", detAllStandDto.getIdeaId());
Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize());
IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
List<SarPublicIdeaAll> sarPublicIdeaAlls=sarPublicIdeaAllDao.getAllDataByIdea(detAllStandDto.getPage(),detAllStandDto.getSize(),detAllStandDto.getIdeaId());
Integer a=sarPublicIdeaAllDao.getAllDataByIdeaCount(detAllStandDto.getIdeaId());
Page userIPage=new Page();
userIPage.setTotal(a);
userIPage.setRecords(sarPublicIdeaAlls);
userIPage.setSize(detAllStandDto.getSize());
userIPage.setCurrent(detAllStandDto.getPage());
System.out.println("总条数" + userIPage.getTotal());
System.out.println("总页数" + userIPage.getPages());
List<SarPublicIdeaAll> list = userIPage.getRecords();
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java
+1
View File
@@ -383,6 +383,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
sarFileSplitItemsEO.setModifyTime(new Date());
sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID()));
result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO);
// SAR_FILE_ITEMS_VAL 添加数据，
adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java
+7
View File
@@ -58,5 +58,12 @@ public class WgDept extends BaseEntity {
@TableField("join_id")
private String joinId;
@ApiModelProperty(value = "手机号")
@TableField("phone")
private String phone;
@ApiModelProperty(value = "邮箱")
@TableField("email")
private String email;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java
+9
View File
@@ -44,5 +44,14 @@ public class WgNetInfo extends BaseEntity {
@TableField("join_id")
private String joinId;
@ApiModelProperty(value = "手机号")
@TableField("phone")
private String phone;
@ApiModelProperty(value = "邮箱")
@TableField("email")
private String email;
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+4 -2
View File
@@ -40,9 +40,11 @@
select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname
ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname,
ts_institution.name as unit,ts_institution.id as unitId
from ts_user
WHERE institution_id=#{institutionId}
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
WHERE institution_id=#{institutionId}
<if test="userName != null and userName != '' ">
and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') )
</if>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+17
View File
@@ -7,4 +7,21 @@
INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
</select>
<select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_user.INSTITUTION_NAME as dept_name,sar_public_idea_all.old_text,
sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid
FROM sar_public_idea_all
left join ts_user on sar_public_idea_all.user_id=ts_user.USID
WHERE
sar_public_idea_all.idea_id = #{ideaId}
LIMIT ${(page-1)*size},${page*size}
</select>
<select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
SELECT count(id)
FROM sar_public_idea_all WHERE
idea_id = #{ideaId}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
+2 -2
View File
@@ -205,7 +205,7 @@
<if test="creationTime != null" >creation_time,</if>
<if test="modifyTime != null" >modify_time,</if>
<if test="modifyUser != null" >modify_user,</if>
<if test="editFlag != null" >edit_flag,</if>
<if test="fo != null" >fo,</if>
<if test="dutyEngineer != null" >duty_engineer,</if>
<if test="claimType != null" >claim_type,</if>
@@ -233,7 +233,7 @@
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
<if test="modifyUser != null" >#{modifyUser, jdbcType=VARCHAR},</if>
<if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR}</if>
<if test="fo != null" >#{fo, jdbcType=VARCHAR},</if>
<if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if>
<if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if>
adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
+6 -4
View File
@@ -3,19 +3,21 @@
<mapper namespace="com.adc.da.slrs.wgDept.dao.WgDeptDao">
<select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName
select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
from wg_dept
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
where wg_dept.wg_id =#{data}
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName
select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
from wg_dept
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
left join wg_work_group on wg_work_group.id = wg_dept.wg_id
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
where wg_work_group.type = #{type}
</select>
adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
+2 -2
View File
@@ -3,7 +3,7 @@
<mapper namespace="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao">
<select id="researchDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
from wg_net_info
left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
@@ -11,7 +11,7 @@
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
from wg_net_info
left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java
+3
View File
@@ -13,6 +13,7 @@ import com.adc.da.ocr.service.OCRRestfulService;
import com.adc.da.ocr.service.OcrRecordEOService;
import com.adc.da.ocr.util.MD5Util;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
@@ -107,11 +108,13 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
page.setOrder("desc");
}
List<OcrRecordEO> rows = ocrRecordEOService.queryByPage(page);
Integer integer = ocrRecordEOService.queryByPageCount(page);
DecimalFormat df = new DecimalFormat("0.00");//设置保留位数
for (OcrRecordEO ocrRecordEO : rows){
ocrRecordEO.setDocRealFile(ocrDownPath+ocrRecordEO.getDocRealName());
ocrRecordEO.setJsonRealFile(ocrDownPath+ocrRecordEO.getJsonRealName());
}
page.getPager().setRowCount(integer);
return Result.success(getPageInfo(page.getPager(), rows));
}
adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java
+1
View File
@@ -23,6 +23,7 @@ public interface OcrRecordEODao extends BaseMapper<OcrRecordEO> {
// int deleteByIds(@Param("idList") List<String> idList);
List<OcrRecordEO> queryByPage(BasePage var1);
Integer queryByPageCount(BasePage var1);
int insertSelective(OcrRecordEO ocrRecordEO);
adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java
+2
View File
@@ -8,6 +8,8 @@ public interface OcrRecordEOService {
List<OcrRecordEO> queryByPage(OcrRecordEOPage page);
Integer queryByPageCount(OcrRecordEOPage page);
int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO);
int deleteByIds(List<String> idList);
adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java
+5
View File
@@ -26,6 +26,11 @@ public class OcrRecordEOServiceImpl implements OcrRecordEOService {
return ocrRecordEODao.queryByPage(page);
}
@Override
public Integer queryByPageCount(OcrRecordEOPage page) {
return ocrRecordEODao.queryByPageCount(page);
}
@Override
public int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO) {
return ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO);
adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml
+14
View File
@@ -221,6 +221,20 @@
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<select id="queryByPageCount" parameterType="com.adc.da.base.page.BasePage" resultType="java.lang.Integer">
select count(id) from
(select tmp_tb.* from
(select <include refid="Base_Column_List" />,(UNIX_TIMESTAMP(modify_time)-UNIX_TIMESTAMP(creation_time)) as spendTime from OCR_RECORD
<include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
<if test="sql != null">
ORDER BY ${sql}
</if>
) tmp_tb ) a
</select>
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List"/> from OCR_RECORD
<include refid="Base_Where_Clause"/>