Skip to content

D
device-back
提交 ba0a3213 authored 作者: Matrix's avatar Matrix
浏览文件
操作

项目结构调整与BUG修复

上级 33af0d6f
隐藏空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 110 行删除
dev-config/pom.xml
浏览文件 @ ba0a3213
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<name>config</name> <name>config</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>equip</artifactId> <artifactId>equip</artifactId>
<groupId>com.tykj</groupId> <groupId>com.tykj</groupId>
...@@ -65,6 +67,7 @@ ...@@ -65,6 +67,7 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
<artifactId>misc</artifactId> <artifactId>misc</artifactId>
...@@ -80,5 +83,4 @@ ...@@ -80,5 +83,4 @@
</dependencies> </dependencies>
</project> </project>
dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @ ba0a3213
...@@ -183,7 +183,10 @@ public class DeviceCheckController { ...@@ -183,7 +183,10 @@ public class DeviceCheckController {
log.info("[核查模块] 专管员A正在进行详情账单核查,且指定下一个审核人B id 为 {}", assignUserId); log.info("[核查模块] 专管员A正在进行详情账单核查,且指定下一个审核人B id 为 {}", assignUserId);
String detailString = transUtil.devLib2String(devLibVo.getDevInLibrary(), devLibVo.getDevNotInLibrary()); String detailString = transUtil.devLib2String(devLibVo.getDevInLibrary(), devLibVo.getDevNotInLibrary());
User currentUser = Objects.requireNonNull(AuthenticationUtils.getAuthentication()).getCurrentUserInfo(); User currentUser = Objects.requireNonNull(AuthenticationUtils.getAuthentication()).getCurrentUserInfo();
detailRepo.updateCheckDetail(id, detailString, checkResult, currentUser.getUserId(), assignUserId); long count = devLibVo.getDevInLibrary().stream()
.filter(deviceInLibVo -> deviceInLibVo.getProofResult() == 1)
.count();
detailRepo.updateCheckDetail(id, detailString, checkResult, currentUser.getUserId(), assignUserId, count);
//2. 推进TASK 状态 //2. 推进TASK 状态
TaskBto currentTask = taskService.get(id, CONFIRM_CHECK_DETAIL.id); TaskBto currentTask = taskService.get(id, CONFIRM_CHECK_DETAIL.id);
currentTask.getInvolveUserIdList().set(0, AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId()); currentTask.getInvolveUserIdList().set(0, AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
......
dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckBillEntity.java
浏览文件 @ ba0a3213
...@@ -41,12 +41,14 @@ public class DeviceCheckBillEntity { ...@@ -41,12 +41,14 @@ public class DeviceCheckBillEntity {
*/ */
@ApiModelProperty(value = "检查组成员1(省A岗)id") @ApiModelProperty(value = "检查组成员1(省A岗)id")
@Column(name = "userA_id")
private Integer userAId; private Integer userAId;
/** /**
* 检查组成员2(省A岗)id * 检查组成员2(省A岗)id
*/ */
@ApiModelProperty(value = "检查组成员2(省A岗)id") @ApiModelProperty(value = "检查组成员2(省A岗)id")
@Column(name = "userB_id")
private Integer userBId; private Integer userBId;
/** /**
* 核查状态(0:决算待审核,1:决算审核失败,2:决算中,3:决算完成) * 核查状态(0:决算待审核,1:决算审核失败,2:决算中,3:决算完成)
......
dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetailEntity.java
浏览文件 @ ba0a3213
...@@ -55,24 +55,28 @@ public class DeviceCheckDetailEntity { ...@@ -55,24 +55,28 @@ public class DeviceCheckDetailEntity {
*/ */
@ApiModelProperty(value = "检查组成员1(省A岗)id") @ApiModelProperty(value = "检查组成员1(省A岗)id")
@Column(name = "check_userA_id")
private Integer checkUserAId = 0; private Integer checkUserAId = 0;
/** /**
* 检查组成员2(省A岗)id * 检查组成员2(省A岗)id
*/ */
@ApiModelProperty(value = "检查组成员2(省A岗)id") @ApiModelProperty(value = "检查组成员2(省A岗)id")
@Column(name = "check_userB_id")
private Integer checkUserBId = 0; private Integer checkUserBId = 0;
/** /**
* 本级经办人id(A岗) * 本级经办人id(A岗)
*/ */
@ApiModelProperty(value = "本级经办人id(A岗)") @ApiModelProperty(value = "本级经办人id(A岗)")
@Column(name = "userA_id")
private Integer userAId; private Integer userAId;
/** /**
* 本级审核人id(B岗) * 本级审核人id(B岗)
*/ */
@ApiModelProperty(value = "本级审核人id(B岗)") @ApiModelProperty(value = "本级审核人id(B岗)")
@Column(name = "userB_id")
private Integer userBId; private Integer userBId;
/** /**
* 核查时间 * 核查时间
......
dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/repository/DeviceCheckDetailDao.java
浏览文件 @ ba0a3213
...@@ -20,8 +20,8 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetailEnt ...@@ -20,8 +20,8 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetailEnt
* @param checkDetail 要更新的检查结果 * @param checkDetail 要更新的检查结果
*/ */
@Modifying @Modifying
@Query("update DeviceCheckDetailEntity o set o.checkDetail=?2,o.checkResult = ?3,o.userAId =?4,o.userBId=?5 where o.id=?1") @Query("update DeviceCheckDetailEntity o set o.checkDetail=?2,o.checkResult = ?3,o.userAId =?4,o.userBId=?5,o.checkedCount=?6 where o.id=?1")
void updateCheckDetail(Integer id, String checkDetail, String checkResult, int userAId, int userBId); void updateCheckDetail(Integer id, String checkDetail, String checkResult, int userAId, int userBId, long checkedCount);
@Modifying @Modifying
@Query("update DeviceCheckDetailEntity o set o.checkStatus=?2 where o.id=?1") @Query("update DeviceCheckDetailEntity o set o.checkStatus=?2 where o.id=?1")
......
dev-device/device-user/pom.xml
浏览文件 @ ba0a3213
...@@ -6,49 +6,27 @@ ...@@ -6,49 +6,27 @@
<artifactId>device</artifactId> <artifactId>device</artifactId>
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<!--<relativePath/>-->
</parent> </parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>device-user</artifactId> <artifactId>device-user</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.modelmapper</groupId> <groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId> <artifactId>modelmapper</artifactId>
<version>2.1.1</version> <version>2.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>com.tykj.dev</groupId>-->
<!--<artifactId>config</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>com.tykj.dev</groupId>-->
<!--<artifactId>device</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.tykj.dev</groupId>-->
<!--<artifactId>misc</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>com.tykj.dev</groupId>-->
<!--<artifactId>device</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
dev-device/pom.xml
浏览文件 @ ba0a3213
...@@ -146,12 +146,6 @@ ...@@ -146,12 +146,6 @@
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
<artifactId>misc</artifactId> <artifactId>misc</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>device</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
......
dev-misc/pom.xml
浏览文件 @ ba0a3213
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<name>misc</name> <name>misc</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>equip</artifactId> <artifactId>equip</artifactId>
<groupId>com.tykj</groupId> <groupId>com.tykj</groupId>
......
dev-union/pom.xml
浏览文件 @ ba0a3213
...@@ -286,29 +286,6 @@ ...@@ -286,29 +286,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>socket</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--<dependency>-->
<!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-socket</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-union</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
<artifactId>rfid</artifactId> <artifactId>rfid</artifactId>
...@@ -363,7 +340,6 @@ ...@@ -363,7 +340,6 @@
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<configuration> <configuration>
<webResources> <webResources>
<!--配置第三方jar包打包的路径--> <!--配置第三方jar包打包的路径-->
<resource> <resource>
...@@ -383,34 +359,11 @@ ...@@ -383,34 +359,11 @@
</resource> </resource>
</webResources> </webResources>
<!-- maven打包的时候告诉maven不需要web.xml,否刚会报找不到web.xml错误 --> <!-- maven打包的时候告诉maven不需要web.xml,否刚会报找不到web.xml错误 -->
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<!--<plugins>-->
<!--&lt;!&ndash;&lt;!&ndash;打包插件&ndash;&gt;&ndash;&gt;-->
<!--<plugin>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-maven-plugin</artifactId>-->
<!--<configuration>-->
<!--<fork>true</fork>-->
<!--<executable>true</executable>-->
<!--<includeSystemScope>true</includeSystemScope>-->
<!--</configuration>-->
<!--</plugin>-->
<!--&lt;!&ndash;&lt;!&ndash;跳过测试插件&ndash;&gt;&ndash;&gt;-->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->
<!--<version>2.20</version>-->
<!--<configuration>-->
<!--<skipTests>true</skipTests>-->
<!--&lt;!&ndash;&lt;!&ndash;默认关掉单元测试 &ndash;&gt;&ndash;&gt;-->
<!--</configuration>-->
<!--</plugin>-->
<!--</plugins>-->
</build> </build>
......
pom.xml
浏览文件 @ ba0a3213
...@@ -113,30 +113,18 @@ ...@@ -113,30 +113,18 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.0.RELEASE</version> <version>2.3.0.RELEASE</version>
<configuration>
<mainClass>com.tykj.equip.EquipApplication</mainClass>
</configuration>
<executions> <executions>
<execution> <execution>
<id>repackage</id>
<goals> <goals>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
<configuration>
<classifier>exec</classifier>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论